Merge pull request #27 from Geodan/master

main merge
websocket versie
Merge branch 'master' of github.com:stvno/icm-ui
Merge pull request #235 from tomvantilburg/master

merge from Tom
Merge pull request #236 from tomvantilburg/master

merge from Tom
Added print support
SignalR version
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	index.html
	src/factories.js
Merge pull request #237 from stvno/master

print support
Merge pull request #58 from Geodan/master

merge from origin