Updated gem
Upgrade sass-rails gem
Update AR-import
Merge branch 'master' into rails4.2

Conflicts:
	Gemfile.lock