ember components
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/ember/application.js.coffee
remove ember components from vendor