Merge branch 'master' into development
Got websocket to communicate with the front-end.
Fixed that ugly bug.
Merge branch 'websocket'