Updated Doctrine object manager injection to entity manager
Merge branch 'master' of https://github.com/isics/OpenMiamMiam