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

Conflicts:
	CTI.WebAtelier/Views/Home/SelectLiningType.cshtml
Merge branch 'master' of https://bartbuurman@github.com/marcobisschop/cti.webatelier.nl.git