display changes for task notice, promotion drop down, ckeditor for templates
Merge remote-tracking branch 'remotes/origin/develop' into develop