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
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
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
Clean

Conflicts:
	src/main/java/be/vdab/services/GebruikerServiceImpl.java
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
Full copy off tim's code
Merge branch 'master' of http://github.com/TimothyXL/JavaMUD

Conflicts:
	src/main/java/be/vdab/web/KarakterController.java
Merge branch 'master' of https://github.com/toyamigo/JavaMUD
Merge branch 'master' of https://github.com/danny-schoeter/JavaMUD

Conflicts:
	src/main/java/be/vdab/web/KarakterController.java
Merge KarakterController
Merge branch 'master' of http://github.com/TimothyXL/JavaMUD
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD
update karakterDAO en orm.xml
Updated dao and service
update file teksten_en
Updated orm
Merge pull request #22 from lanxiang/master

update karakterDAO en orm.xml