合并master分支
合并master分支

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
修改登录跳转
合并dev-hzx分支
解决冲突
Merge branch 'dev-ywt' of https://github.com/hnlshzx/PPMoneyClient into dev-ywt

Conflicts:
	src/com/pmp/ppmoney/PPMoneyApplication.java