Hoofdmenu
error fix en delete method toegevoegd voor GebruikerController
Merged toyamigo-master
nieuwe exception
Merged lanxiang-master
update
Karakterlijst.jsp + karakter.naam
Clean

Conflicts:
	src/main/java/be/vdab/services/GebruikerServiceImpl.java
karakter.naam
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD

Conflicts:
	src/main/java/be/vdab/dao/GebruikerDAO.java
	src/main/java/be/vdab/dao/GebruikerDAOImpl.java
	src/main/java/be/vdab/entities/Karakter.java
	src/main/java/be/vdab/services/GebruikerService.java
	src/main/java/be/vdab/services/GebruikerServiceImpl.java
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD into latestTim