Merge branch 'master' into develop

diff --cc boot.php
index 54ff94830344dced581f9025087cdf419bddaa46,d74f38914c7f2b25009a712e8b68abc5c773a2c4..fbf4a90d29874f372ed31c903cc45f37ccf7a03a
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -16,9 -16,9 +16,9 @@@ require_once('include/dbstructure.php')
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
  define ( 'FRIENDICA_CODENAME',     'Ginger');
- define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
+ define ( 'FRIENDICA_VERSION',      '3.3.3' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1178      );
 +define ( 'DB_UPDATE_VERSION',      1180      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  

diff --cc include/network.php
Simple merge