Merge remote-tracking branch 'origin/master' into rendering
shader version 130
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ServerEgg.java
camera tests
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/game/ClientGame.java
bla
Merge remote-tracking branch 'origin/master' into rendering

Conflicts:
	gdx-bunny-brawl/src/main/java/de/hochschuletrier/gdw/ws1314/entity/levelObjects/ServerEgg.java
entityrenderer update
camera works
Merge remote-tracking branch 'origin/master' into rendering
Merge remote-tracking branch 'origin/master' into rendering
new stuff rendered and features
Merge remote-tracking branch 'origin/master' into rendering
Merge branch 'rendering'