Makes uniqueness check on question level instead of answer_option
Merge remote-tracking branch 'origin/develop' into develop