Merge remote-tracking branch 'DannyMUD/master'

Conflicts:
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'XiangMUD/master'

Conflicts:
	pom.xml
	src/main/java/be/vdab/dao/GebruikerDAOImpl.java
aanmaken KarakterService
tonytest
toevoegen KarakterServiceImpl
update
update
update orm.xml
Merge remote-tracking branch 'remotes/TimMUD/master'

Conflicts:
	pom.xml
	src/main/java/be/vdab/dao/GebruikerDAOImpl.java
	src/main/webapp/WEB-INF/web.xml
update
Merge pull request #6 from danny-schoeter/master

KarakterService
delete toegevoegd.jsp
Merged branch lanxiang
Merged branch lanxiang
Merged branch lanxiang
paswoord.java
Merge pull request #8 from lanxiang/master

paswoord.java
Merge branch 'master' of https://github.com/toyamigo/JavaMUD
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/services/GebruikerService.java
Hoofdmenu