Conflits merge avec test

diff --cc buildout.cfg
Simple merge

diff --cc project/settings.py
index e7a74ed,ffa3803..80feca5
--- 1/project/settings.py
--- 2/project/settings.py
+++ b/project/settings.py
@@@ -109,30 -105,5 +110,31 @@@ ADMIN_TOOLS_INDEX_DASHBOARD = 'project.
  AJAX_LOOKUP_CHANNELS = {
      'responsables' : ('dae.catalogues', 'Responsable'),
      'dossiers' : ('dae.catalogues', 'Dossier'),
+     'postes' : ('dae.catalogues', 'Poste'),
  }
 +
 +TINYMCE_DEFAULT_CONFIG = {
 +'theme': "advanced",
 +'plugins':"paste",
 +'theme_advanced_buttons1' : "bold,italic,underline,|,formatselect,|,bullist,numlist,|,undo,redo,|,link,unlink",
 +'theme_advanced_buttons2' : "",
 +'theme_advanced_buttons3' : "",
 +'theme_advanced_statusbar_location' : "bottom",
 +'theme_advanced_toolbar_align' : "left",
 +'theme_advanced_styles' : "Titre=titre;Sous-titre=sous-titre;Normal=normal",
 +'width' : "800",
 +'height' : "200",
 +'theme_advanced_resizing' : "true",
 +'custom_undo_redo_levels': 10,
 +'theme_advanced_toolbar_location' : 'top',
 +'inline_styles' : 'false',
 +'paste_use_dialog' : 'false',
 +'paste_auto_cleanup_on_paste' : 'true',
 +'paste_convert_headers_to_strong' : 'false',
 +'paste_strip_class_attributes' : 'all',
 +'paste_remove_spans' : 'true',
 +'paste_remove_styles' : 'true',
 +'content_css' : '/media/css/tinymce.css',
 +}
 +
 +#FILE_PROTECTION_METHOD = 'basic'