Final sql
Fixes
Merge branch 'frontend' of github.com:utwente-di/di18
Merge branch 'database' of github.com:utwente-di/di18
Merge branch 'master' of github.com:utwente-di/di18