Added Bonjour to conf
Merge branch 'master' of https://github.com/kigiri/Chupato

Conflicts:
	conf/worldserver.conf