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

diff --cc boot.php
index 9e72f73a702d013a21571ec4b703ad19e8135371,0e8f017f46e8ea89204bff0bfa52e393ec3c7855..9fea12f04c63d98e3355a11f20e58e3583657d9e
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -9,9 -9,9 +9,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1366' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1367' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1148      );
+ define ( 'DB_UPDATE_VERSION',      1149      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );