Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle

diff --cc admin/tool/lp/templates/manage_competency_frameworks_page.mustache
Simple merge

diff --cc admin/tool/lp/templates/manage_templates_page.mustache
Simple merge

diff --cc admin/tool/lp/templates/plans_page.mustache
Simple merge

diff --cc admin/tool/lp/templates/user_evidence_list_page.mustache
Simple merge