* Corrected websocket error, due to chrome update probably + jquery map 404
Merge branch 'Hotfix/0.5.5' into develop