Merge https://github.com/friendica/friendica into pull

diff --cc boot.php
index cfe8cbcbd3dd80cf6385713318ea5dc122042b7f,6794a1f9f5529ed52ae9e4f58942b025222a2e1a..b83fe32a1ecb3c170a2758f9ad62d3c15e0a7f97
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,10 +9,10 @@@ require_once('include/pgettext.php')
  require_once('include/nav.php');
  require_once('include/cache.php');
  require_once('library/Mobile_Detect/Mobile_Detect.php');
+ require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1534' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1535' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1156      );