conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mzgxt/src/cn/com/gszw/mzgxt/client/MainActivity.java