Merge commit 'origin/master' into hruid

diff --cc bin/cron/emails.check.php
Simple merge

diff --cc classes/xorgsession.php
Simple merge

diff --cc modules/marketing.php
index 9e62667,eb0778d..f6ac4fb
--- 1/modules/marketing.php
--- 2/modules/marketing.php
+++ b/modules/marketing.php
@@@ -157,9 -154,9 +157,9 @@@ class MarketingModule extends PLModul
          $res = XDB::iterator(
                  "SELECT  r.*, a.alias
                     FROM  register_marketing AS r
-              INNER JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
+               LEFT JOIN  aliases            AS a ON (r.sender=a.id AND a.type = 'a_vie')
                    WHERE  uid={?}
 -               ORDER BY  date", $uid);
 +               ORDER BY  date", $user->id());
          $page->assign('addr', $res);
  
          $res = XDB::query("SELECT date, relance FROM register_pending

diff --cc templates/admin/utilisateurs.tpl
Simple merge

diff --cc templates/emails/send.tpl
Simple merge

diff --cc templates/include/form.valid.mark.tpl
Simple merge

diff --cc templates/marketing/private.tpl
Simple merge

diff --cc templates/marketing/public.tpl
Simple merge