test map change
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master

Conflicts:
	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/game/Game.java
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
Merge branch 'master' of https://github.com/Lusito/GameDevWeek into physik-master
Merge branch 'physik-master'
Merge branch 'master' of https://github.com/Lusito/GameDevWeek