something...
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
Merge pull request #44 from Geodan/master

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

merge from origin
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
some config changes
Merge pull request #185 from tomvantilburg/master

merge from Tom