Merge remote-tracking branch 'origin/master' into nginx

Conflicts:
	web/briskin5/index_wr.php
	web/index_wr.php

diff --cc INSTALL.sh
Simple merge

diff --cc web/Obj/brisk.phh
Simple merge

diff --cc web/Obj/dbase_pgsql.phh
Simple merge

diff --cc web/Obj/sac-a-push.phh
Simple merge

diff --cc web/Obj/user.phh
Simple merge

diff --cc web/briskin5/Obj/briskin5.phh
Simple merge

diff --cc web/commons.js
Simple merge

diff --cc web/index.php
Simple merge

diff --cc web/index_wr.php
index 71b3f9c0933f8d2873d1671c2cda6e2f0c027b44,c427c3d084f341d76295f1ba5794f48dde074e4e..48b3c14511fcb053d9f9ac3403c61990319a4564
--- 1/web/index_wr.php
--- 2/web/index_wr.php
+++ b/web/index_wr.php
@@@ -736,17 -765,9 +765,9 @@@ function index_wr_main(&$brisk, $remote
              log_wr($user->comm[$user->step % COMM_N]);
              $user->step_inc();
  
-         }
-         else if ($argz[0] == 'whysupport') {
-             $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-             $user->comm[$user->step % COMM_N] .=  show_notify(str_replace("\n", " ", $G_room_whysupport[$G_lang]), 0, $mlang_indwr['btn_backtotab'][$G_lang], 400, 200);
- 
-             log_wr($user->comm[$user->step % COMM_N]);
-             $user->step_inc();
- 
          }
          else if ($argz[0] == 'chatt') {
-             $brisk->chatt_send($user, xcapemesg($mesg));
 -            $brisk->chatt_send(&$user, xcapemesg($mesg), $mlang_indwr);
++            $brisk->chatt_send($user, xcapemesg($mesg), $mlang_indwr);
          }
          else if ($argz[0] == 'tosmgr') {
              // check IF is authnticated user, both terms of service versions matches