A lot of rolit changes.
Merge branch 'kevin'
Merge branch 'sophie'
Merge branch 'sophie' of https://github.com/Kurocon/softwaresystemen into sophie