Merge remote-tracking branch 'remotes/origin/dev-ls' into dev
重命名适配器
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