AnswerManager added
Merge remote-tracking branch 'origin/ManagerClasses' into ManagerClasses