google cloud
Merge branch 'dev' of https://github.com/TranscendComputing/CloudMux into dev

Conflicts:
	Gemfile.lock