Merge branch 'master' of github.com:Aldlevine/Kaskade.js-node

Conflicts:
	lib/cfg.js
	lib/data.js
	lib/server.js
	package.json