Merge branch 'database' of github.com:utwente-di/di18 into Tests
Merge branch 'frontend' of github.com:utwente-di/di18 into Tests
Test to string now checks ToString containing parentID
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend