Cleanup and added defines
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arduino/Controller/Controller.ino
	Arduino/FC/FC.ino