Merge branch 'hotfix/hotfix'
jQuery Validation update
Merge branch 'hotfix/hotfix' into develop