..
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
Merge branch 'dev' into dev-ywt
修改了布局文件,逐步实现产品列表和申购记录功能
产品列表功能
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
Merge branch 'dev' into dev-ywt
产品列表功能
更多设置...选项开关图片更新
更新布局
Merge remote-tracking branch 'remotes/origin/dev-ls' into dev
合并dev-ls分支
Merge branch 'dev' into dev-hzx
Merge branch 'dev' into dev-ls

Conflicts:
	res/values/activity-strings.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java