删除临时产生的文件
解决冲突
用apotomo异步添加rooms和members
Merge remote-tracking branch 'simlegate/master'

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.slim
	app/views/layouts/product.html.slim
	app/views/members/_index.html.slim
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
cells重构
merge simlegate