Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
	templates/xnetgrp/membres-edit.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc classes/address.php
Simple merge

diff --cc classes/phone.php
Simple merge

diff --cc modules/profile/jobs.inc.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge

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

diff --cc templates/profile/jobs.job.tpl
Simple merge

diff --cc templates/register/step3.tpl
Simple merge

diff --cc templates/xnetgrp/membres-edit.tpl
index ca37807,a9c2ea5..92a3833
--- 1/templates/xnetgrp/membres-edit.tpl
--- 2/templates/xnetgrp/membres-edit.tpl
+++ b/templates/xnetgrp/membres-edit.tpl
@@@ -76,20 -76,7 +76,20 @@@
          </select>
        </td>
      </tr>
-     {if !$user->profile()}
 +    <tr class="pair">
 +      <td class="titre">
 +        Poste&nbsp;:
 +      </td>
 +      <td>
 +        <select name="group_position">
 +          <option value=""{if $user->group_position eq ''} selected="selected"{/if}></option>
 +          {foreach from=$positions item=position}
 +          <option value="{$position}"{if $user->group_position eq $position} selected="selected"{/if}>{$position}</option>
 +          {/foreach}
 +        </select>
 +      </td>
 +    </tr>
+     {if $user->type eq 'virtual' || $user->type eq 'xnet'}
      <tr class="impair">
        <td class="titre">
          Type d'utilisateur&nbsp;: