Upgrade ember-simple-auth
Merge branch 'master' into beta

Conflicts:
	bower.json