Scott Lahteine 7431ef7e2d Merge branch 'Development' into dev_version ...

Latest upstream commits

2015-04-07 21:14:00 -07:00

..

Configuration_adv.h

Updates for the configurator

2015-04-06 23:16:01 -07:00

Configuration.h

Merge branch 'Development' into dev_version

2015-04-07 21:14:00 -07:00