Merge pull request #1 from TimothyXL/master

Pull request test
Merge pull request #4 from toyamigo/master

Merge pull request #1 from TimothyXL/master
Imported lanxiang-master
Merge pull request #3 from lanxiang/master

Pull request test
Imported danny-schoeter-master
Merge branch 'master' of https://github.com/TimothyXL/JavaMUD.git
Updated web.xml
Updated pom
Item entity
update spring security
POM updated
Item entity & karakter entity
Merge pull request #5 from danny-schoeter/master

update spring security
Item service
ItemDAO temp.
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