database.yml
Merge branch 'master' of ssh://code.dface.cn/food

Conflicts:
	config/database.yml
m
m
m
m
以商家身份发消息，其聊天id为s+商家id
Merge branch 'master' of ssh://code.dface.cn/food
merge
[模型]为打印机管理添加打印机imei号字段
[页面/控制器]添加设备imei号字段

Note:
1,采用simpleform中的f.association修改桌位编辑，以修复桌位无法编辑的bug
nginx配置
nginx 配置
nginx 配置
nginx 配置
manager nginx 配置
[db]执行数据迁移，添加sim卡号到Printer
[页面]添加sim卡号新建和修改
[控制器]为控制器添加sim卡号
Merge branch 'master' of ssh://code.dface.cn/food

Conflicts:
	app/views/admin/printers/_fields.html.erb
	app/views/admin/printers/_table.html.erb