something...
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
some config changes