Merge branch 'master' into dev
changed to cmsassets version of jquery
Merge branch 'dev'