Merge branch 'master' of git://github.com/pixhawk/qgroundcontrol into dev

.cproject

.project

images/style-mission.css

lib/QMapControl/src/geometry.cpp

lib/QMapControl/src/geometry.h

lib/QMapControl/src/layer.cpp

lib/QMapControl/src/layermanager.cpp

qgroundcontrol.pri

qgroundcontrol.pro

src/Waypoint.h

src/WaypointGlobal.cpp

src/WaypointGlobal.h

src/uas/UAS.cc

src/uas/UASWaypointManager.cc

src/ui/MainWindow.cc

src/ui/MainWindow.ui

src/ui/MapWidget.cc

src/ui/MapWidget.h

src/ui/WaypointGlobalView.cpp

src/ui/WaypointGlobalView.h