update
Merge branch 'master' of github.com:momoplan/Android

Conflicts:
	Ruyicai_General/main/v_main/src/com/ruyicai/activity/join/JoinDetailActivity.java