update Gems
Merge branch 'master' of github.com:thelabtech/ccc360

Conflicts:
	Gemfile.lock