Merge branch 'master' of https://github.com/DJxLaurens/TheAteam4.git

Conflicts:
	src/Webapp/Dbconnection.java
Merge branch 'master' of https://github.com/DJxLaurens/TheAteam4.git
Merge branch 'master' of https://github.com/DJxLaurens/TheAteam4.git
Database connection working
Regsiter.jsp eddited, also added a combobox with user roles