added craigs code plus new OF Server
Merge branch 'master' of github.com:bbrock25/engage3D

Conflicts:
	websocket-kinect/client-surface/live-model-faces.js