Fix small bugs.

Conflicts:
	app/controllers/pages_controller.rb
	app/controllers/users_controller.rb
	app/views/pages/saloon.html.erb