Merge pull request #25 from Geodan/master

merge from origin
Merge pull request #26 from Geodan/master

Fixed type bug
Merge pull request #27 from Geodan/master

merge from origin
Merge pull request #28 from Geodan/master

merge from origin
Added socketserver store and different behaviour of websccket connect.
! This WILL break the icm-ui.
Merge pull request #118 from tomvantilburg/master

merge from Tom