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

diff --cc boot.php
index 6a4287819f269ce4e71a8d9e6d4466fbf2c343f4,742948f7bfa510886e55dc456b200a9bb328acd7..18313b4cdf61705b5aaa83a8a0805457b41685dd
--- 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.1362' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1363' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1147      );
+ define ( 'DB_UPDATE_VERSION',      1148      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );