Some code cleanup, including changing the #textfield in Notification Editor to #textarea.
Merge remote-tracking branch 'origin/development' into development