*Bugfixes
Merge branch 'master' of https://github.com/Fear837/AnimalProtect.git

Conflicts:
	src/de/Fear837/Main.java