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

Conflicts:
	Ruyicai_General/main/v_main/res/values/color.xml
	Ruyicai_General/main/v_main/src/com/ruyicai/constant/Constants.java