完成根据商圈搜索商家的页面
Merge branch 'master' of https://github.com/hbtelecom/AutoQueue

# By dangdangzone
# Via dangdangzone
* 'master' of https://github.com/hbtelecom/AutoQueue:
  二维码识别
  完成杂志
  杂志初版
  杂志初版

Conflicts:
	AutoQueue/.DS_Store
	AutoQueue/Views/TabViewController.m