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

Conflicts:
	update.php

diff --cc boot.php
index e0b768171a19764ce9133476cb98a8af99781fe8,f7d38c2551ece07077ccd21ad89ffa5f3f25b051..170c9953b9d4098948b8e1e05197a6785211e738
--- 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.1419' );
+ define ( 'FRIENDICA_VERSION',      '3.0.1423' );
  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 update.php
index 789ff9f45dd32958b8c097c8ffc28f1a60a8fd10,19e6cf3bdf78c06eae128ee1f383eb4f902d3492..c41acf6fbcf5e8d8c9d86209dae9e4f02f53ae3e
--- 1/update.php
--- 2/update.php
+++ b/update.php
@@@ -1343,11 -1343,3 +1343,10 @@@ function update_1153() 
        if(!$r) return UPDATE_FAILED;
        return UPDATE_SUCCESS;
  }
- 
 +
 +function update_1154() {
 +      $r = q("UPDATE `item` SET `thr-parent`=`parent-uri` WHERE `id`!=`parent` AND `thr-parent`=''");
 +      
 +      if(!$r) return UPDATE_FAILED;
 +      return UPDATE_SUCCESS;
 +}