Updated gems
Updated gems
Updated gems
Set sudo: false for new Docker CI
Merge branch 'master' into rails3.2

Conflicts:
	Gemfile.lock