20140708
temp
Merge branch 'dev-ch'

Conflicts:
	gen/shixun/gapmarket/R.java
	src/com/webapp/ui/MarketListAdapter.java
	src/com/webapp/view/AppMarket.java
empty notification
dd
ss