G
Merge branch 'master' of https://github.com/703510680/new.git

Conflicts:
	Weproject/src/com/ys/tj/TestActivity.java