Update to latest ember-cli
Merge branch 'master' of github.com:bmac/firecheck

Conflicts:
	app/routes/room/index.js