Started the actual server!
Merge branch 'master' into rbranch

Conflicts:
	newserver.js