fixed sort/fos parameters
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend
Merged master into frontend
Errorless push
Automaticaly merged conflicting tests
fdasfas
Merge branch 'master' of github.com:utwente-di/di18 into database
jsp idea full
Fix errors
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend
added recent versions of tag files
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend
Added clearDatabase and updated initDatabases
.gitignore
Commit
fdasf
Merge branch 'database' of github.com:utwente-di/di18 into database
.gitignore
Merge branch 'master' of github.com:utwente-di/di18 into database
Fix3