Replace RAILS_ROOT with Rails.root for Rails 3
Replace Dispatcher.to_prepare with Rails.configuration.to_prepare
Fix the "can't modify frozen array" error with Rails 3
Rename the .rhtml files to .html.erb for Rails 3
Update the routing for Rails 3
Explicitly add a survey method to UserController

Previously the survey.rhtml method was rendered by default
if no action matching 'survey' was found in the controller,
but this doesn't seem to be the case with some configurations.
This is rather unsatisfactory, in that we haven't found
documentation of any change that might cause this different
behaviour, but the pragmatic solution is to just to add
the empty survey method and move on.
Since mailer views are plain text, they should be text.erb

Thanks to Henare Degan for pointing this out in his theme upgrade
document.
Configuration is now AlaveteliConfiguration
Merge remote-tracking branch 'mysociety_github/rails-3' into rails-3
Merge branch 'rails-3'
Update initial_request.text.erb

Use the raw helper so that characters like ' are not HTML escaped in outgoing email messages.  This is already done in the initial_request.text.erb shipped with Alaveteli.
Merge remote-tracking branch 'scjody_github/master'
Fix typo.
Merge branch 'master' into develop
Merge branch 'develop'
Only set up FastGettext on initialization, even in development mode

Even on a very fast computer, there is a significant delay (a couple
of seconds) in processing every request in development mode.  This
is because the configuration of FastGettext's paths for finding
translations is done in a block passed to
Rails.configuration.to_prepare, which causes the block to be run
before every request by the Rails Reloader in developmetn mode.

It seems to be work fine just running the FastGettext calls on
initialization in development mode, however - customizations in
the theme's locale-theme directory still have effect in
development mode even after the reloader has reloaded classes
before handling subsequent requests.  So, I think this change
should be safe.  This commit introduces that change, having the
effect that development mode is much more responsive.
Merge branch 'improve-development-performance' into develop
Merge branch 'develop'
Switch to work with the feature/wip-switch-to-asset-pipeline branch
Refer to the precompiled application.css, which includes custom.css