Fixed problems created by Haas
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend