Merge branch 'master' into hruid

diff --cc classes/xnetsession.php
Simple merge

diff --cc classes/xorgsession.php
Simple merge

diff --cc modules/admin.php
Simple merge

diff --cc modules/axletter.php
Simple merge

diff --cc modules/carnet.php
Simple merge

diff --cc modules/forums.php
Simple merge

diff --cc modules/googleapps.php
index ae15cd5,553aeaf..c2c4e53
--- 1/modules/googleapps.php
--- 2/modules/googleapps.php
+++ b/modules/googleapps.php
@@@ -42,9 -42,9 +42,9 @@@ class GoogleAppsModule extends PLModul
          require_once("googleapps.inc.php");
          $page->changeTpl('googleapps/index.tpl');
          $page->addJsLink('motdepasse.js');
-         $page->setTitle('Polytechnique.org - Compte Google Apps');
+         $page->setTitle('Compte Google Apps');
  
 -        $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife'));
 +        $account = new GoogleAppsAccount(S::user());
  
          // Fills up the 'is Google Apps redirection active' variable.
          $page->assign('redirect_active', false);

diff --cc modules/lists.php
Simple merge

diff --cc modules/marketing.php
Simple merge

diff --cc modules/newsletter.php
Simple merge

diff --cc modules/platal.php
Simple merge

diff --cc modules/profile.php
Simple merge

diff --cc modules/register.php
Simple merge