Merge branch 'master' into beta

tools/patches/2addDbTermsConditionsToTeam.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../../src/server/server/config/boot_global.php';
 require_once __DIR__ . '/../../src/server/server/config/boot_local.php';
 
-function patch_addTermsConditionsToTeam()
+function patch()
 {
 
     $db = TB_Shared_Db_TeamData::get();