Upgrade Rails for security alert
Merge branch 'master' of github.com:collex/catalog

Conflicts:
	Gemfile