修改了注册

Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev' into dev-ls
合并分支
合并分支

Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev-ls' of https://github.com/hnlshzx/PPMoneyClient into dev-ls

Conflicts:
	.classpath
修改了productlist的布局文件
Merge branch 'dev' into dev-ywt
Merge branch 'dev' into dev-ywt
Merge branch 'dev-ywt' into dev
提交
Merge branch 'dev' into dev-ywt

Conflicts:
	src/com/pmp/ppmoney/activity/VerifyCodeActivity.java
修改了布局文件
实现了找回密码功能，和修改了注册

Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev-ls' of https://github.com/hnlshzx/PPMoneyClient into dev-ls

Conflicts:
	res/layout/activity_register.xml
	res/layout/activity_verifycode.xml
	res/values/activity-strings.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
	src/com/pmp/ppmoney/activity/FindModifyPwdActivity.java
	src/com/pmp/ppmoney/activity/FindVerifyCodePwdActivity.java
	src/com/pmp/ppmoney/activity/RegisterActivity.java
	src/com/pmp/ppmoney/activity/VerifyCodeActivity.java
修改了注册

Signed-off-by: liushan1991 <657627052@qq.com>
合并dev-ywt分支
合并dev-ls分支

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