House cleaning, some refactor, nothing new =)
Password reset test mini refactor
Merge ../x0y0

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/password_resets_controller.rb
	app/views/users/show.html.erb
	test/models/user_test.rb