Added in personFactory
Moved in changes not ported from the doctrine branch
Updated unit tests