Merge branch 'master' into openid

Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml

config/environment.rb

@@ -54,6 +54,7 @@ Rails::Initializer.run do |config|
   config.gem 'httpclient'
   config.gem 'ruby-openid', :lib => 'openid', :version => '>=2.0.4'
   config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer'
+  config.gem 'sanitize'
 
   # Only load the plugins named here, in the order given. By default, all plugins
   # in vendor/plugins are loaded in alphabetical order.