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

diff --cc boot.php
index cd6f6a8d889ae563b961e4fd321d1ae00d2a4317,c03eca498ec5913696ec0d9147185fca390655b0..200ce28172fa222b33103f6e2b18efb3e387b7df
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -12,10 -12,9 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.1.1614' );
 +define ( 'FRIENDICA_VERSION',      '3.1.1618' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1159      );
- 
+ define ( 'DB_UPDATE_VERSION',      1162      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  

diff --cc include/network.php
Simple merge