user edit actions
Merge branch 'master' of https://github.com/leonidez/cohort-ember

Conflicts:
	app/controllers/user.js