New MapManager
Merge branch 'master' of
https://github.com/winjunetech/GDSConHandAndroid.git

Conflicts:
	GDSConHand/libs/gdsconhand_com_lib.jar