Merge branch 'master' of https://github.com/TheFenderStory/Ember-Server-V6

Conflicts:
	components.js