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

diff --cc boot.php
index 10195c2bac60dd544aa21251da43662de8b53e6b,5563901fb79f338e2628bcdf4938e0009e3ddda9..f98e530442bebb964244e7a7478ca37496ffecfd
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -5,10 -5,9 +5,10 @@@ require_once('include/network.php')
  require_once('include/plugin.php');
  require_once('include/text.php');
  require_once("include/pgettext.php");
 +require_once('include/nav.php');
  
  
- define ( 'FRIENDIKA_VERSION',      '2.2.1093' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1096' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1087      );
  

diff --cc include/template_processor.php
Simple merge

diff --cc mod/network.php
Simple merge