Merge branch 'dev'

Conflicts:
	project/rh/admin.py

diff --cc project/rh/admin.py
index e64ed9a,ab79128..f815ade
--- 1/project/rh/admin.py
--- 2/project/rh/admin.py
+++ b/project/rh/admin.py
@@@ -18,13 -19,11 +19,11 @@@ import auf.django.references.models as 
  from project.decorators import in_drh_or_admin
  from project.groups import grp_correspondants_rh
  from project.groups import get_employe_from_user
- 
--import project.rh.models as rh
++from project.rh import models as rh
++from project.rh.change_list import ChangeList
  from project.rh.forms import ContratForm, AyantDroitForm, EmployeAdminForm, \
            AjaxSelect, DossierForm, ResponsableInlineForm
 -from project.rh.change_list import ChangeList
  
- from project.rh.change_list import ChangeList
- 
  
  class BaseAdmin(admin.ModelAdmin):