Merge remote-tracking branch 'friendika-master/master' into admin

diff --cc include/nav.php
Simple merge

diff --cc view/theme/duepuntozero/style.css
index 8799726,9555a1e..5632342
--- 1/view/theme/duepuntozero/style.css
--- 2/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@@ -2572,8 -2519,9 +2586,11 @@@ a.mail-list-link 
  .youtube { background-position: -64px -32px;}
  .attach { background-position: -80px -32px; }
  .language { background-position: -96px -32px; }
- .on { background-position: -112px -32px; }
- .off { background-position: -128px -32px; }
+ .prev { background-position: -112px -32px; }
+ .next { background-position: -128px -32px; }
++.on { background-position: -144px -32px; }
+ 
++.off { background-position: 0px -48px; }
  
  .attachtype {
        display: block; width: 20px; height: 23px;