Several fixes
Merge branch 'master' of https://github.com/marcobisschop/cti.webatelier.nl.git