Merge branch 'feature/rails-3-2-upgrade-spike' into feature/switch-to-asset-pipeline

Conflicts:
	Gemfile.lock
	app/assets/images/admin-theme/ui-bg_flat_0_aaaaaa_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_55_fbf9ee_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_65_ffffff_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_75_cccccc_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_75_dadada_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_75_e6e6e6_40x100.png
	app/assets/images/admin-theme/ui-bg_flat_75_ffffff_40x100.png
	app/assets/images/admin-theme/ui-bg_inset-soft_95_fef1ec_1x100.png
	app/assets/images/admin-theme/ui-icons_222222_256x240.png
	app/assets/images/admin-theme/ui-icons_2e83ff_256x240.png
	app/assets/images/admin-theme/ui-icons_454545_256x240.png
	app/assets/images/admin-theme/ui-icons_888888_256x240.png
	app/assets/images/admin-theme/ui-icons_cd0a0a_256x240.png
	app/assets/javascripts/admin.js
	app/assets/javascripts/admin/jquery-ui.min.js
	app/assets/javascripts/application.js
	app/assets/javascripts/jquery-ui.min.js
	app/assets/javascripts/jquery.flot.errorbars.min.js
	app/assets/javascripts/jquery.flot.min.js
	app/assets/javascripts/stats.js
	app/assets/stylesheets/application.css
	app/assets/stylesheets/fonts.scss
	app/views/general/_stylesheet_includes.html.erb
	app/views/layouts/admin.html.erb
	app/views/layouts/default.html.erb
	app/views/public_body/statistics.html.erb
	config/application.rb
	config/environments/development.rb
With Rails 3.2, switching theme requires asset recompilation