Merge branch 'dev' into dev-ywt
Merge branch 'dev' into dev-ywt
修改了status的判断
简单实现分享功能,还需完善
添加了充值记录和添加了一些注释
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