not working copy
Merge branch 'master' of https://github.com/bradleytrager/EmberSkeleton

Conflicts:
	app/controllers/ApplicationController.js
	app/controllers/RegisterController.js