Intermediate commit
merged
left-over of tutor regeneration.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git