Merge remote-tracking branch 'upstream/develop' into contact-tabs

diff --cc src/Model/Contact.php
Simple merge

diff --cc src/Model/GContact.php
index 1650123c73443c2aa1e8c81ef94b9ce81dca6c6c,3051202689b8dbec14bad90ffb40f709ba73266d..78583bcc5a1f08b9a7fd6c2e9e7ec6b77bd6e305
--- 1/src/Model/GContact.php
--- 2/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@@ -22,7 -22,10 +22,9 @@@
  namespace Friendica\Model;
  
  use Exception;
 -use Friendica\Core\Protocol;
  use Friendica\Database\DBA;
+ use Friendica\DI;
+ use Friendica\Util\DateTimeFormat;
  
  /**
   * This class handles GlobalContact related functions