Fix bug with socket-disconnects. Change events to have array instead of single object
Merge branch 'dev' into feature-sidebarui