Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/mallen/flightui/panels/AutopilotPanel.java
	src/com/mallen/flightui/panels/LightPanel2.java