Switch to official gem for cap-55
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile.lock