Merge branch 'master' of https://github.com/mangosvb/serverZero

Conflicts:
	Server/WorldServer/Objects/WS.CharManagment.vb