finer state machine for sprties
Merge branch 'master' of github.com:ushu/z-project

Conflicts:
	z-project/BaseCharacter.h
	z-project/Civilian.mm
	z-project/GameLayer.mm
	z-project/Zombie.mm
Merge branch 'master' of github.com:ushu/z-project
fix interface
Merge branch 'master' of github.com:ushu/z-project
use contentSize instead of boundingBox
Merge branch 'master' of github.com:ushu/z-project
remove unused file reference