Bump rails version to fix vulnerabilities that were just made public.
Merge branch 'master' into comments

Conflicts:
	Gemfile.lock