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

diff --cc boot.php
index 340ef139942bce9534b3e1e4b795f15ebf986aae,bcff5dddd26343375aa222363058a233c21e3d68..76a11652d1aebf50189fb2b418e44c28249467b3
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -10,9 -10,9 +10,9 @@@ require_once('include/nav.php')
  require_once('include/cache.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
 -define ( 'FRIENDICA_VERSION',      '3.0.1412' );
 +define ( 'FRIENDICA_VERSION',      '3.0.1413' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
- define ( 'DB_UPDATE_VERSION',      1153      );
+ define ( 'DB_UPDATE_VERSION',      1154      );
  
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );