Rails gem update to 4.1.6
Merged master into support_sciences_site.
Merge conflicts

* Gemfile.lock