cleaning up Aunit
Merge remote-tracking branch 'origin/master' into Carrie-3.24

Conflicts:
	src/com/testgame/mechanics/unit/AUnit.java
merged in master
still cleaning up and refactoring a unit
end of class
got z layering working

fixes any incorrect highlights on top of characters and health/energy
mode now appear behind character
fixed animation bug

was really simple, just had to remove an incorrect line of code yay!
Merge fixes