提交以解决冲突
Merge branch 'master' of https://github.com/tcmaster/OurProject

Conflicts:
	Joocola/src/com/android/joocola/activity/PersonalDetailActivity.java