miniarena fix
Merge branch 'master' of https://github.com/hottehead/GameDevWeek
Lösche inkorrekte Maps
Fix ClientEntity / Server EntityManager
ClientGame und ServerGame vervollständigt
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/tiled/Layer.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/ClientEntityManager.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
Merge branch 'master' of https://github.com/hottehead/GameDevWeek

Conflicts:
	.gitignore
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/gdx/assets/ImageX.java
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/gdx/physix/PhysixEntity.java
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/tiled/Layer.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/ClientEntityManager.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ChatListener.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/gdx/assets/ImageX.java
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/gdx/physix/PhysixEntity.java
	gdw-commons/src/main/java/de/hochschuletrier/gdw/commons/tiled/Layer.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/ClientEntityManager.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/Game.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/ChatListener.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java
Same shit as 10 in before
Merge branch 'master' into network/main