Merge branch 'assignment'
Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of github.com:worklist/hifi
Merge branch 'master' of github.com:worklist/hifi
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:worklist/hifi
add mongoose webserver to domain-server
open up a JS editor at /assignment on DS webserver
remove unused parts of ace editor
remove web directory before copying, clean more of ace
Merge branch 'master' of github.com:worklist/hifi into domain-web-server
add a more helpful message to the DS root index.html
Merge branch 'assignment' into domain-web-server
Merge branch 'assignment' into domain-web-server
Merge branch 'assignment' into domain-web-server
Merge branch 'master' of github.com:worklist/hifi into domain-web-server
Merge pull request #923 from birarda/domain-web-server

add a mongoose webserver to the domain-server
VoxelSpaceRender improvements, fixing voxel selection UI
Fix voxel erase bug in nudge code. Fix rendering of nudge guide.
Merge remote-tracking branch 'upstream/master'