project rename, html/jsp placeholders
Merge branch 'master' of git@github.com:utwente-di/di20.git