BRM - fix categories widget.  This will allow posting from the
channel page again.  But this template is really, really messy
and needs a rewrite really.
Merge remote-tracking branch 'upstream/master'
Some more adaptions to the mail_list page