Merge branch 'hotfix_rap_video' into development
Fixed wrong answer
Merge branch 'hotfix_wrong_answer'