Merge with database branche
Merge branch 'master' of github.com:utwente-di/di18
Merge branch 'Tests' of github.com:utwente-di/di18
Tools.java merge
Merged Tests into master
Merge branch 'master' of github.com:utwente-di/di18
Schildpadje
D-day: first working JSP AJAX request
COmmit
Merge branch 'database' of github.com:utwente-di/di18
Merge branch 'master' of github.com:utwente-di/di18 into frontend
Fixed merge conflicts
Merge branch 'database' of github.com:utwente-di/di18 into frontend
User edit page start
Merge branch 'database' of github.com:utwente-di/di18 into frontend
Merged database into frontend
Xml + xsd fieldofstudies en skills
XML reader
GetAllIdeas fix
Merge branch 'database' of github.com:utwente-di/di18