Merge branch 'improve_json' into phil

qgroundcontrol.pro

src/Wima/Geometry/GeoPoint3D.cpp

src/Wima/Geometry/GeoPoint3D.h

src/Wima/Geometry/Polygon2D.h

src/Wima/Geometry/PolygonArray.h

src/Wima/Geometry/WimaPolygonArray.h

src/Wima/Snake/QNemoHeartbeat.h

src/Wima/Snake/QNemoProgress.h

src/Wima/Snake/QtROSJsonFactory.h

src/Wima/Snake/QtROSTypeFactory.h

src/Wima/Snake/SnakeTilesLocal.h

src/Wima/WimaController.cc

src/Wima/WimaController.h

src/Wima/WimaController_new.cc

src/Wima/WimaController_new.h

src/comm/ros_bridge/include/CasePacker.h

src/comm/ros_bridge/include/ComPrivateInclude.cpp

src/comm/ros_bridge/include/GenericMessages.h

src/comm/ros_bridge/include/JsonFactory.h

src/comm/ros_bridge/include/JsonMethodes.h