Make JQuery load using default page scheme
Merge branch 'master' into custom-theme