Change Load JS/CSS to speed up page load
Merge branch 'master' into course_placeholder