Switch Doctrine mapping from Annotations to XML
Merge branch 'ChapterTwo-3' into development