Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/cognition/socketHandler.js