Update rails version for security issue.
Merge branch 'master' into uiuc-connections

Conflicts:
	Gemfile.lock