Merge branch 'upgrade-ember-cli'

Conflicts:
	frontend/bower.json