Changes to server code
Merge branch 'master' of https://github.com/akivab/3d
Merge remote-tracking branch 'origin/master' into add-javascript-controls