Conflicts: src/uas/QGCMAVLinkUASFactory.cc src/uas/QGCMAVLinkUASFactory.h
Compiling 32bit on Mac OS again to re-gain Google Earth support, fixed MAP API KEY to re-enable Google Maps support, added Asctec Hex rotor and SenseSoar models