Merge branch 'hotfix'
fixed js call to wp-color-picker
Merge branch 'hotfix' into develop