merge
Merge remote-tracking branch 'origin/devise' into devise

Conflicts:
	app/views/devise/registrations/edit.html.haml
Merge remote-tracking branch 'origin/devise' into devise
mensaje