wip
Entity wip
Merge branch 'master' of https://github.com/VladaHejda/ShelterModel
Merge branch 'master' of https://github.com/VladaHejda/ShelterModel