Change order of question groups
Update template to change order of questions
Merge remote-tracking branch 'origin/develop' into develop