merged branch dev/portSpatialOrganization into master; resolved conflict with README.md
merged branch dev/portSpatialOrganization into master; resolved conflict with README.md

BioDynaMo/biodynamo,BioDynaMo/biodynamo,BioDynaMo/biodynamo,BioDynaMo/biodynamo