Merge branch 'master' into develop
Changed welcome text field to WYSIWYG. No adverse effects.
Merge branch 'COALS-92' into develop
Merge branch 'develop'