Fixed comm error
Merge branch 'master' of https://github.com/ZimonD/ContextCG7

Conflicts:
	src/client/connect.js
	src/client/tutorial.js