修改商铺部分功能

增加点击效果，增加暂用图标，修改关于商铺的若干
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_discovery.xml
	src/com/example/tx/activity/DiscoveryActivity.java
	src/com/example/tx/activity/MarketActivity.java
	src/com/example/tx/util/C.java
Merge branch 'master' of https://github.com/yanshanlangren/tx