Merge branch 'master' of https://github.com/gszw/gsds-mobile.git

Conflicts:
	Mzgxt/AndroidManifest.xml