* 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

Add gstreamer debug log option, and dot file output

Localization update

Fix NMEA settings layout

Insert ROI command which is supported by firmware

Eliminated flight widget "states"
Define flight widget top margin (plugin options)

Adjust colors
Remove unused image

Structure Scan: Structure height support

Hide popup icon until mouseover

Compute plan view items visibility on the fly.

Handle settings when armed

Remove disabled yawVehicleToStructure option

Merge branches 'localizationUpdate' and 'master' of https://github.com/mavlink/qgroundcontrol into localizationUpdate

More fixes

More meta data fixes

Fix console spew from Qml complaints

Remove qDebug

Fix meta data again

Updating localization sources