Added betterwms
bugfix incidentctrl
some more
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui