properties reorganization and templates refactoring
Merge branch 'master' of https://github.com/HogeschoolLeiden/website