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

diff --cc boot.php
index 73cfe6e064544783431646be7e7e4a1e34b4e1ea,a196ccadc416eb377aa9fba7c724d9a8b9214b0d..d7c00428fd3bc8b008d8ded304f28d34deb29a24
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -5,12 -5,11 +5,12 @@@ 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.1087' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1093' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1084      );
+ define ( 'DB_UPDATE_VERSION',      1087      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc include/text.php
Simple merge

diff --cc mod/admin.php
Simple merge

diff --cc mod/network.php
Simple merge