Merge pull request #170 from akvo/feature/169-eng-1328-new-question-type-attachment