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

.gitignore

data/yahoo_aerial.earth

data/yahoo_heightfield.earth

data/yahoo_maps.earth

data/zurich.earth

images/earth.html

images/style-mission.css

lib/QMapControl/src/emptymapadapter.cpp

lib/QMapControl/src/mapcontrol.cpp

lib/QMapControl/src/point.cpp

lib/QMapControl/src/tilemapadapter.cpp

lib/QMapControl/src/wmsmapadapter.cpp

lib/QMapControl/src/yahoomapadapter.cpp

lib/mac32-gcc40/frameworks/.gitignore

lib/mac32-gcc40/frameworks/README

lib/mac32-gcc40/include/.gitignore

lib/mac32-gcc40/include/curl/curl.h

lib/mac32-gcc40/include/curl/curlbuild.h

lib/mac32-gcc40/include/curl/curlrules.h

lib/mac32-gcc40/include/curl/curlver.h