列表功能
Merge branch 'dev' into dev-ywt
Merge remote-tracking branch 'remotes/origin/dev-ywt' into dev
添加支付界面资源
添加条码图片
Merge branch 'dev' into dev-ywt
产品详情界面返回
修改了status的判断
添加产品申购
简单实现分享功能,还需完善
Merge branch 'dev' into dev-ywt
添加了充值记录和添加了一些注释
更新代码
Merge remote-tracking branch 'remotes/origin/dev-ywt' into dev
Merge remote-tracking branch 'remotes/origin/dev-ls' into dev

Conflicts:
	AndroidManifest.xml
	src/com/pmp/ppmoney/PPMoneyApplication.java
	src/com/pmp/ppmoney/activity/InvestCompleteActivity.java
	src/com/pmp/ppmoney/activity/InvestProgressActivity.java
	src/com/pmp/ppmoney/activity/PayActivity.java
	src/com/pmp/ppmoney/activity/RewardListActivity.java
	src/com/pmp/ppmoney/activity/TradeListActivity.java
修改了充值记录

Signed-off-by: liushan1991 <657627052@qq.com>
添加支付功能
合并
应用开发
修改支付