Achieve separation of articles and questions
Merge branch 'feature-type-separation' into development

* feature-type-separation:
  Achieve separation of articles and questions