Fix some issues caused by jquery version upgrade
Merge branch 'master' into wmplus