Update rails to fix security problem.
Fix 20120706222200_port_esr_files_to_carrierwave migration.
Update CHANGELOG.
Merge branch 'master' into upgrade

Conflicts:
	Gemfile.lock