Profile update fix
Merge remote-tracking branch 'ta/master'

Conflicts:
	app/controllers/users_controller.rb