Version 0.1.4
Merge remote-tracking branch 'ember-cli-update/master'

Conflicts:
	app/index.html