Historia dlugow.
Merge branch 'master' into pablo

Conflicts:
	app/controllers/users_controller.rb