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

diff --cc boot.php
index 852b8eef339a78c61a92d1261a7d30319e633533,721fbe6e9dfb5833b08b0e1d903e5471caa4c4d6..1a93086aea81cbb06af3bb907613a8f239957ec6
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,9 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1584' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1586' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1157      );
+ define ( 'DB_UPDATE_VERSION',      1158      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc mod/display.php
Simple merge