add some question types of quiz module
Merge branch 'feature-quizChangeOption' into develop
fix merge conflict