bj refactor
Merge remote-tracking branch 'origin/master'

Conflicts:
	node_modules/cognition/engine.js
sM and Ybj
using source engine
sM and Ybj working