Updated gems
Merge branch 'master' into displays

Conflicts:
	Gemfile.lock