Merge...
Merge branch 'master' of https://github.com/XMrVertigoX/boneserver

Conflicts:
	node/boneControl.js
	node/index.js
	node/settings-default.json
	node/settings.js
	node/timer.js