Change usage of Spot and replace with Doctrine
Merge Doctrine branch
Merge branch 'master' into unit_testing