Added ModalQuestionCreator and PronounReplacer
Merge branch 'architecture'