Old stuff. Bad commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	BWO_Server/src/bwo/server/zones/BasicZone.java
	BWO_Server/src/bwo/server/zones/BasicZoneArea.java
	BWO_Server/src/bwo/server/zones/ZoneArea.java