Create and implement the 'edit discussions' widget.
Merge origin/newframework and fix conflicts
Follow up on 'edit discussion'
Added some docs + re-ordering