Merge branch 'hbrysiewicz-authentication' into authentication

Conflicts:
	ember/app/controllers/application.js