Security update for rails to 4.1.7, and sass-rails to 4.0.4 which updates the sprockets to 2.11.3
Merge branch 'master' into support_sciences_site

Conflicts:
	Gemfile
	Gemfile.lock