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
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.
Merge branch 'login'