Replace require_js, which is gone from moodle 2.4
Merge branch 'release-v2.1'