no message
Merge branch 'master' of https://github.com/hbtelecom/AutoQueue

# By dangdangzone
# Via dangdangzone
* 'master' of https://github.com/hbtelecom/AutoQueue:
  修复订餐问题
  修补提交
  杂志

Conflicts:
	AutoQueue/.DS_Store