Alma flight plan and new servo adjustments. Failsafe tested to work well. - Sheldon
Changed collor of sectors in flight plan. Added control_panel.xml in anticipation of merge. - Cameron
Merge branch 'uaarg_v4.2', remote-tracking branch 'remotes/origin/uaarg_v4.2' into uaarg_v4.2

Conflicts:
	conf/control_panel.xml
Fixing simple typo. - Cameron