Merge remote-tracking branch 'fabrix/newui'

diff --cc boot.php
index 48d52846ee551aa5cac34357fc3c80cf8537094a,44bfa868abfef7850539da4d64a1b984b31720c0..5b32e05736321831575ede3201a8c9d9e58e4429
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -5,9 -5,10 +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.3.1115' );
 +define ( 'FRIENDIKA_VERSION',      '2.3.1116' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
  define ( 'DB_UPDATE_VERSION',      1092      );