Update Rails version
Update Rails version
Merge remote-tracking branch 'origin/master' into new-users

Conflicts:
	Gemfile.lock