ests
Merge remote-tracking branch 'origin/master'

Conflicts:

	gdx-kitten-rescue/src/main/java/de/hochschuletrier/gdw/ss14/ui/LaserCatMenu.java
merge