Upgrade to latest Rails release

Conflicts:
	Gemfile.lock