Started  work on 2d zone functionality..
Merge HEAD (Entity.java conflict).