modify net url
修改了布局文件
Merge branch 'master' of https://github.com/hnlshzx/PPMoneyClient
合并master分支
合并master分支

Conflicts:
	res/values/colors.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java