Indentation a la Rails
Merge ../x0y0

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/password_resets_controller.rb
	app/controllers/profiles_controller.rb
	app/controllers/sessions_controller.rb
	app/controllers/users_controller.rb