Merge pull request #36 from lergo/lergo125

Lergo108 and lergo 123
Merge branch 'develop' of local repository into lergo-109
Lergo-126 : clicks/marks of correct answers should be cleared when
"clicking" on "next"