Mainframework Compatability
Merge branch 'SQL-templates' of https://github.com/utwente-di/di07 into SQL-templates