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

Conflicts:
	Ruyicai_General/main/v_main/res/values/color.xml
	Ruyicai_General/main/v_main/res/values/strings.xml