..

..
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ui/map/QGCMapWidget.cc