Fixed issue: HTML editor for admin notifications used even if text is set.
Dev Small fix for test script
Merge remote-tracking branch 'origin/master'