Merge branch 'AirmapUI' into Airmap

* AirmapUI:
  Restore expanded state when enabling AirMap
  AirMap Settings
  Control on Fly View Eliminated flight widget "states" Define flight widget top margin (plugin options)
  Add expand icon
  Expand/Colapse Controllers Adjust colors Remove unused image
  Initial Mockup

# Conflicts:
#	src/Settings/AppSettings.cc
#	src/Settings/AppSettings.h