update for users the list of editable attributes
Merge branch 'master' of gitlab.com:poulet_a/epifail

Conflicts:
	app/controllers/users_controller.rb