Indentation a la Rails
Use lock version in profiles
Merge ../x0y0

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