fix the wrong jquery url name.
fix the boring double snashes after 'media'.
conflict resolve
Merge branch 'zxdvd-yifan' into sumasia14