Merge branch 'muppdev' into 'master'

hub3.6 - template changes

See merge request disroot/hubzilla/beetroot!1

beetroot/pdl/mod_network.pdl

@@ -1,12 +1,13 @@
 [region=aside]
+[widget=activity_order][/widget]
+[widget=activity_filter][/widget]
 [widget=savedsearch][/widget]
 [widget=collections][/widget]
 [widget=forums][/widget]
 [widget=xchan][/widget]
 [/region]
- 
+
 [region=content]
-[widget=affinity][/widget]
 $content
 [/region]
 
@@ -15,4 +16,3 @@ $content
 [widget=filer][/widget]
 [widget=suggestions][/widget]
 [/region]
-