Configuration changes for upgrade to rails 3.1 including switching on asset pipeline (required by activeadmin)
Set length of top level domain so subdomain is recognised correctly in rails 3.1
types of parameters changed a little in rails 3.1
Don't need escape parameter in url helper anymore
cache parameter in javascript_include_tag not used with asset system
Moved bulk of javascripts and stylesheets to asset pipeline
rails g active_admin:install
Remove old local files for rails_admin
Add default translations for active_admin
Upgrade to latest rails 3.1 and fix redirection route
bundle update
Remove lock on version of formtastic
rails g rspec:install
We can't use capybara 2 with ruby 1.8.7

Conflicts:
	Gemfile.lock
bundle update
Upgrade to rails 3.2
Add javascript runtime to production for precompiling assets
Precompile extra assets
Add asset precompilation step to deploy
rails and json gem security update