更新文件
Merge branch 'dev' into dev-hzx

Conflicts:
	src/com/pmp/ppmoney/PPMoneyApplication.java
	src/com/pmp/ppmoney/activity/RegisterActivity.java
	src/com/pmp/ppmoney/activity/VerifyCodeActivity.java
添加验证码界面