Merged with master and resolved conflicts.
This directory contains bundles relating to the persistence of domain objects.