Improved web backend with support for multiple websockets
Merge remote-tracking branch 'refs/remotes/origin/master'
Messing with the test page.
Merge branch 'master' into HEAD
Merge commit '2756178'
Merge commit '696670b'