merge dev

diff --cc project/recrutement/urls.py
index 8a2e18f,073a57a..c774b20
--- 1/project/recrutement/urls.py
--- 2/project/recrutement/urls.py
+++ b/project/recrutement/urls.py
@@@ -1,15 -1,20 +1,15 @@@
  # -*- encoding: utf-8 -*
 -from django.conf.urls.defaults import patterns, url
 -
 -
 -"""    url(r'^pieces/$', 'recrutement.api.postuler_appel_offre', 
 -    name='pieces'),
 -
 -url(r'^postuler_appel_offre/$', 
 -    'recrutement.api.postuler_appel_offre', name='postuler_appel_offre'), 
 -"""  
  
 +from django.conf.urls.defaults import patterns, url
 +from auf.django.emploi import settings
  
- urlpatterns = patterns('',
+ urlpatterns = patterns('recrutement.views',
      url(r'^$', 'index', name='index'),
  
-     (r'^prive/(?P<path>.*)$', 'recrutement.views.mediaserve', {'document_root': settings.OE_PRIVE_MEDIA_ROOT}),
++    (r'^prive/(?P<path>.*)$', 'mediaserve', {'document_root': settings.OE_PRIVE_MEDIA_ROOT}),
 +
      url(r'^affecter_evaluateurs_offre_emploi/$', 
-         'recrutement.views.affecter_evaluateurs_offre_emploi', 
+         'affecter_evaluateurs_offre_emploi', 
          name='affecter_evaluateurs_offre_emploi'),
  
      url(r'^envoyer_courriel_candidats/$', 
@@@ -17,9 -22,6 +17,9 @@@
          name='envoyer_courriel_candidats'),
  
      url(r'^selectionner_template/$', 
-         'recrutement.views.selectionner_template', 
+         'selectionner_template', 
          name='selectionner_template'),
 +
-     url(r'candidat_pdf/$', 'recrutement.views.candidat_pdf', 
++    url(r'candidat_pdf/$', 'candidat_pdf', 
 +        name='candidat_pdf'),
  )

diff --cc project/settings.py
Simple merge

diff --cc src/qbe
index 0000000,0000000..2503a3e
new file mode 160000 (submodule)
--- /dev/null
--- /dev/null
+++ b/src/qbe
@@@ -1,0 -1,0 +1,1 @@@
++Subproject commit 2503a3ecb80a3e1d76316c5a0badac18e5b838fb