..

..
Merge branch 'master' of https://github.com/mattmccrink/qgroundcontrol

Conflicts:
	src/ui/map/QGCMapWidget.cc