Add animal and plants
Merge branch 'develop' of github.com:accoleon/worldsim into develop
Merge branch 'develop' of github.com:accoleon/worldsim into develop

Conflicts:
	World.cpp
	worldsim.cpp
Merge branch 'develop' of github.com:accoleon/worldsim into develop