Turn Entity class hierarchy into real taxonomy. Put all Entity classes into a single file again to avoid mutual imports
Merge branch 'master' of github.com:m4xm/EvolutronicLife

Conflicts:
	lib/Entities.py