kleine namensänderungen
Werteanpassung
merger
Merge branch 'master' of https://github.com/mo-zo/Projekt-Pikachu

Conflicts:
	projekt-pikachu/src/main/java/org/petsim/domain/item/Ball.java
	projekt-pikachu/src/main/java/org/petsim/domain/item/Frisbee.java
	projekt-pikachu/src/main/java/org/petsim/domain/item/Skippingrope.java