Removed nullpointers exceptions
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ModelPkg/Animal.java
	src/ModelPkg/Behavior.java