zone
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
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
you can create more clientEntities now
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
more clientEntities creatable
EggCount und Egg einsammeln finalisiert
Merge remote-tracking branch 'origin/master'
more clientEntities creatable
Merge branch 'master' of https://github.com/hottehead/GameDevWeek.git
fix dummy map, test entity loading
# arrow now functional