提交下
。。
dad
Merge branch 'master' of https://github.com/tcmaster/OurProject

Conflicts:
	Joocola/bin/AndroidManifest.xml