MB-141 #comment adding token to URL to enable kinoma to work with
wot-in-a-box
Merge branch 'master' of github.com:WoTio/pontifex.ws

Conflicts:
	lib/WebSocket.coffee
MB-141 #comment Adding makefile to integrate with build system for
wot-in-a-box