Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
修改了交易记录和我的赠送
Merge branch 'dev' into dev-ls
创建了申购记录的布局文件和Activity
投资记录
删除我的交易记录和赠送
Signed-off-by: liushan1991 <657627052@qq.com>
Merge branch 'dev' into dev-ls

Conflicts:
	src/com/pmp/adapter/RewardListAdapter.java
	src/com/pmp/adapter/TradeListAdapter.java
	src/com/pmp/ppmoney/activity/RewardListActivity.java
	src/com/pmp/ppmoney/activity/TradeListActivity.java
..
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
Merge branch 'dev' into dev-ywt
修改了布局文件,逐步实现产品列表和申购记录功能
产品列表功能
合并dev-ywt分支
合并dev-ls分支

Conflicts:
	src/com/pmp/ppmoney/PPMoneyApplication.java
Merge branch 'dev-hzx' into dev
合并所以分支
Merge branch 'dev' of https://github.com/hnlshzx/PPMoneyClient into dev
Merge branch 'dev' into dev-ywt
产品列表功能
更多设置...选项开关图片更新
更新布局