test
Merge branch 'master' of https://github.com/shegang/testsouzhoubian

Conflicts:
	SerchSourround/src/com/she/SerchSourround/MainActivity.java