Fixed "We're sorry" message for user admin page.
Merge branch 'rails-3' of github.com:papyri/sosol into rails-3

Conflicts:
	app/models/user.rb