Merge branch 'master' of https://github.com/utwente-di/di15
Merge branch 'categories'
Merge conflicts
Updated databasequeries and databasequeries test, fixed imports
Optimized project structure and packages
Merge conflicts a
Diverge fix
Transactie aangepast naar meer input
Updated queries for new database layout.
Updated driver loading for SQL
Added overview page for after login
Added email-address to registration and improved UX after registration.
pagina voor toevoegen transaction naar jsp en aangepaste css
Merge branch 'login' into add_transaction
addTransaction omgezet naar jsp
Fixed logged in header to save the login status over multiple pages
merge conflicts