Merge branch 'hotfix/hotfix'
WYSIHTML5 update
Form fix
Merge branch 'hotfix/hotfix' into develop