修改了产品列项目表显示的名字
修改了赠送

Signed-off-by: liushan1991 <657627052@qq.com>
...
Merge branch 'dev' into dev-ywt
Merge branch 'dev' into dev-ls

Conflicts:
	res/values/activity-strings.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
解决了产品列表无法显示条目的问题
添加了产品列表的返回键的监听器,在登陆页面添加了返回主菜单按钮
Merge remote-tracking branch 'remotes/origin/dev-ywt' into dev
Merge remote-tracking branch 'remotes/origin/dev-hzx' into dev
添加