添加首页热门商铺

添加首页热门商铺，修改时间获取，修改营业时间判断逻辑，增加热门分类布局
Merge branch 'master' of https://github.com/yanshanlangren/tx

Conflicts:
	src/com/example/tx/activity/MarketActivity.java