Merge remote-tracking branch 'origin/master' into staging
Merge branch 'stable' into staging
Merge branch 'stable' into staging
Merge branch 'master' into staging
Fixed race condition bug
[frontend] Added marmoset service.
Merge remote-tracking branch 'kpalway/master'
[frontend] Websocket adjustments.
[frontend] Rework websockets service.
[frontend] Some more reorganization.
[backend] Use parallel-compile-files instead.
[backend] Adjust unlock-project.
[frontend] Start work on project service.
[frontend] Reorganize.
[frontend] Modify scripts, back up old version.
[frontend] Move out templates in anticipation of moving to angular routes.
[frontend] Some more cleanup.
[frontend] Fix small typo.
[backend] Loop on compiler exception tossed.
Merge remote-tracking branch 'origin/stable'