edit user and password
fixes for ita
user set properly on form. labels fixed for password change
Merge branch 'profile-edit', remote-tracking branch 'origin'

Conflicts:
	app/views/users/show.html.slim
	config/locales/en.active_record.yml
	config/locales/en.yml
	config/locales/es.active_record.yml
	config/locales/es.yml
	config/routes.rb
Fixed some bugs and style