merge info
Merge branch 'Str_Transplant' of https://github.com/trunone/GPPlatformMain into Str_Transplant

Conflicts:
	Framework/include/LocationStatus.h
	Framework/include/TCoordinate.h
	Framework/src/location/LocationManager.cpp
	Framework/src/location/LocationStatus.cpp
	Linux/build/Makefile