Merge branch 'master' into newui

diff --cc boot.php
index 399e100d0b20159aae7324bd35b8c671d26689fa,ae3c04b77cd42499577aa701071fb9c448821b9e..bfdae47be18af5816488d7d3e5eba313fb3b5123
--- 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.1074' );
+ define ( 'FRIENDIKA_VERSION',      '2.2.1079' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
- define ( 'DB_UPDATE_VERSION',      1079      );
+ define ( 'DB_UPDATE_VERSION',      1081      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc mod/contacts.php
Simple merge

diff --cc mod/message.php
Simple merge

diff --cc mod/profile.php
Simple merge