# Added State machine driven event handling for ServerPlayer # Added
FacingDirection.NONE # Added State and IStateListener # Added
TeamColor.BOTH
Merge remote-tracking branch 'origin/master' into fapo_dev

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java