修改了赠送

Signed-off-by: liushan1991 <657627052@qq.com>
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
改了产品列表功能