Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

diff --cc boot.php
index 90d5c856e0a369a6062d11c7f6625a258fab6649,1f6937b6488a1b475e98fdbb9450cf5829223805..e0b768171a19764ce9133476cb98a8af99781fe8
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -11,9 -11,9 +11,9 @@@ require_once('include/cache.php')
  require_once('library/Mobile_Detect/Mobile_Detect.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.0.1418' );
+ define ( 'FRIENDICA_VERSION',      '3.0.1419' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1154      );
 +define ( 'DB_UPDATE_VERSION',      1155      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --cc include/conversation.php
Simple merge