Upgrade Rails to latest security release
Merge branch 'master' into add_catalog_url

Conflicts:
	Gemfile.lock