返回外卖商店数据，但是无法显示商店名
Merge branch 'feature/take_away' of github.com:ZJU-ISST/isst-android into feature/take_away

Conflicts:
	src/cn/edu/zju/isst/ui/main/NewMainActivity.java
	src/cn/edu/zju/isst/v2/db/CSTProvider.java