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
Diverge fix
Updated queries for new database layout.
Updated driver loading for SQL
Updated queries for new database layout.
Updated driver loading for SQL
Added overview page for after login
Added overview page for after login
Added email-address to registration and improved UX after registration.
Added email-address to registration and improved UX after registration.
Merge branch 'login'
Merge branch 'login'
Merge branch 'master' of https://github.com/utwente-di/di15
Merge branch 'database_new' of https://github.com/utwente-di/di15 into database_new