Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/webapi/handlers.py
Websocket initial commit