Added Location and Company with a prePersit listener

Modified Company with a listener
Merge pull request #40 from poledev/issue-15

Added Location and Company with a prePersist listener