Merge branch 'master' into develop
Fix returning one lesson
Refactor quiz controller
Add SideKiq