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

diff --cc boot.php
index 2bdf6a602f68f685710d0de2b1ffc41a30c14d6e,fdd2ccd8c53b50b858a46d774e6fc9ab0851b562..0b4c66b6321fab456cdb61fa11855a15b0e7b270
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -10,9 -10,9 +10,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1394' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1395' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1151      );
+ define ( 'DB_UPDATE_VERSION',      1152      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );