Upgrade ember-cli to 0.0.42
Merge branch 'upgrade-ember-cli'

Conflicts:
	frontend/bower.json