# Moved facingDirection and getter / setter to ServerEntity
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ServerPlayer.java
Merge remote-tracking branch 'origin/master'