hunter
Merge remote-tracking branch 'origin/master' into rendering
render fixes
blubb
Merge remote-tracking branch 'origin/master' into rendering
Fix Maven Snapshots update
Merge branch 'rendering' of https://github.com/hottehead/GameDevWeek into rendering
switching animations
stuff
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ClientPlayer.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/projectile/ClientProjectile.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/projectile/ServerProjectile.java
Server und Client GameplayState in DualGameplayState zusammen gefasst
Merge branch 'integration_test/network_gameplay2' of https://github.com/hottehead/GameDevWeek.git into integration_test/network_gameplay2
scaling hud
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ClientServerConnect.java
updates
resolution change
Merge branch 'master' into integration_test/network_gameplay2

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/Main.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/player/ClientPlayer.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ServerGame.java
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/hud/MainMenuStage.java
Nullpointer in NetworkManager gefixt,
Neues Menü Button hinzugefügt
Merge branch 'integration_test/network_gameplay2' of https://github.com/hottehead/GameDevWeek.git into integration_test/network_gameplay2
Merge branch 'network/commands' into integration_test/network_gameplay2

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/network/NetworkManager.java