fix 200 - Uncaught TypeError. Props alessandrotesoro tareq1988
Merge branch 'fix-wysiwyg-js' into dev