bug fixes
Merge branch 'master' of https://github.com/lucisgit/moodle-mod-panopto
fixed confict