mads messed up the names of the templates
Merge branch 'master' of https://github.com/catelevator/catelevator into mads