From 091c01ce81f7620feaf917b622f3cc689d8d5d18 Mon Sep 17 00:00:00 2001
From: Bachir Soussi Chiadmi <bachir@g-u-i.me>
Date: Mon, 21 Nov 2016 19:39:50 +0100
Subject: [PATCH] updated features : created showroom_localisation field. Perms
 with showroom role are still failing

---
 ...rio_administration.features.menu_links.inc |  18 +-
 ...dministration.features.user_permission.inc |   1 -
 .../materio_administration.views_default.inc  | 190 +++++++++---------
 ...erio_content_types.features.field_base.inc |   6 +-
 ..._content_types.features.field_instance.inc |  24 +--
 ...content_types.features.user_permission.inc |  16 +-
 .../materio_content_types.field_group.inc     |  39 +++-
 .../materio_content_types.info                |   2 +
 .../materio_content_types.strongarm.inc       | 107 +++++++---
 .../materio_content_types.views_default.inc   |   2 +-
 ...aterio_publications.features.user_role.inc |   6 +
 ..._publications.features.workflow_access.inc |  50 +++++
 .../materio_publications.info                 |   3 +
 .../showroom/showroom.features.field_base.inc |  90 +++++++++
 .../showroom.features.field_instance.inc      | 172 ++++++++++++++++
 .../features/showroom/showroom.features.inc   |   3 +
 .../showroom/showroom.features.menu_links.inc |  38 ++++
 .../showroom.features.user_permission.inc     | 109 +++++++++-
 .../showroom/showroom.field_group.inc         |  79 ++++++++
 .../modules/features/showroom/showroom.info   |  28 +++
 .../features/showroom/showroom.strongarm.inc  |  30 +++
 21 files changed, 843 insertions(+), 170 deletions(-)
 create mode 100644 sites/all/modules/features/showroom/showroom.features.menu_links.inc
 create mode 100644 sites/all/modules/features/showroom/showroom.field_group.inc

diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
index d35da7ea..f3e7322d 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc
@@ -41,7 +41,7 @@ function materio_administration_menu_default_menu_links() {
     'module' => 'system',
     'hidden' => 0,
     'external' => 0,
-    'has_children' => 1,
+    'has_children' => 0,
     'expanded' => 0,
     'weight' => -46,
     'customized' => 1,
@@ -135,7 +135,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_companies:admin/content/companies.
   $menu_links['navigation_companies:admin/content/companies'] = array(
@@ -197,7 +196,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_compose-tips:filter/tips.
   $menu_links['navigation_compose-tips:filter/tips'] = array(
@@ -263,7 +261,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_didactique:node/add/didactique.
   $menu_links['navigation_didactique:node/add/didactique'] = array(
@@ -286,7 +283,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_duplicate-mails:admin/users/duplicatemails.
   $menu_links['navigation_duplicate-mails:admin/users/duplicatemails'] = array(
@@ -361,7 +357,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_feedback:admin/reports/feedback.
   $menu_links['navigation_feedback:admin/reports/feedback'] = array(
@@ -528,7 +523,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_mandrill:admin/reports/mandrill.
   $menu_links['navigation_mandrill:admin/reports/mandrill'] = array(
@@ -568,7 +562,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_members:admin/users/members.
   $menu_links['navigation_members:admin/users/members'] = array(
@@ -698,7 +691,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_onthologie:admin/structure/taxonomy/onthologie.
   $menu_links['navigation_onthologie:admin/structure/taxonomy/onthologie'] = array(
@@ -766,7 +758,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_page:node/add/page.
   $menu_links['navigation_page:node/add/page'] = array(
@@ -789,7 +780,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_pages--didactique--faq:admin/content/pages.
   $menu_links['navigation_pages--didactique--faq:admin/content/pages'] = array(
@@ -833,7 +823,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_produit:node/add/product.
   $menu_links['navigation_produit:node/add/product'] = array(
@@ -856,7 +845,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_publication:node/add/publication.
   $menu_links['navigation_publication:node/add/publication'] = array(
@@ -876,7 +864,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_reports:admin/store/reports.
   $menu_links['navigation_reports:admin/store/reports'] = array(
@@ -897,7 +884,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_store:admin/store',
   );
   // Exported menu link: navigation_shopping-cart:cart.
   $menu_links['navigation_shopping-cart:cart'] = array(
@@ -942,7 +928,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
   // Exported menu link: navigation_strings-search:admin/config/regional/translate/translate.
   $menu_links['navigation_strings-search:admin/config/regional/translate/translate'] = array(
@@ -1186,7 +1171,6 @@ function materio_administration_menu_default_menu_links() {
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
-    'parent_identifier' => 'navigation_add-content:node/add',
   );
 
   // Translatables
diff --git a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
index 884f1580..7b9f2dfc 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.features.user_permission.inc
@@ -313,7 +313,6 @@ function materio_administration_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
-      'Showroom' => 'Showroom',
       'Student' => 'Student',
       'Translator' => 'Translator',
       'Unverified' => 'Unverified',
diff --git a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
index 1ffccb3a..47b212aa 100644
--- a/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
+++ b/sites/all/modules/features/materio_administration/materio_administration.views_default.inc
@@ -424,7 +424,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
   $handler->display->display_options['fields']['title']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title']['hide_alter_empty'] = FALSE;
-  /* Field: Nœud: Référence Materio */
+  /* Field: Content: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -434,13 +434,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: Nœud: Manufacturer */
+  /* Field: Content: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['label'] = 'Fabricants / Distributeurs';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Field: Nœud: Distributor */
+  /* Field: Content: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -813,7 +813,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  /* Field: Nœud: Image */
+  /* Field: Content: Image */
   $handler->display->display_options['fields']['field_materiau_image']['id'] = 'field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['table'] = 'field_data_field_materiau_image';
   $handler->display->display_options['fields']['field_materiau_image']['field'] = 'field_materiau_image';
@@ -824,7 +824,7 @@ function materio_administration_views_default_views() {
   );
   $handler->display->display_options['fields']['field_materiau_image']['delta_limit'] = '1';
   $handler->display->display_options['fields']['field_materiau_image']['delta_offset'] = '0';
-  /* Field: Nœud: Image */
+  /* Field: Content: Image */
   $handler->display->display_options['fields']['field_visuel']['id'] = 'field_visuel';
   $handler->display->display_options['fields']['field_visuel']['table'] = 'field_data_field_visuel';
   $handler->display->display_options['fields']['field_visuel']['field'] = 'field_visuel';
@@ -839,13 +839,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['type']['id'] = 'type';
   $handler->display->display_options['fields']['type']['table'] = 'node';
   $handler->display->display_options['fields']['type']['field'] = 'type';
-  /* Field: Nœud: Titre */
+  /* Field: Content: Titre */
   $handler->display->display_options['fields']['title_field']['id'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['table'] = 'field_data_title_field';
   $handler->display->display_options['fields']['title_field']['field'] = 'title_field';
   $handler->display->display_options['fields']['title_field']['element_type'] = 'strong';
   $handler->display->display_options['fields']['title_field']['link_to_entity'] = 1;
-  /* Field: Nœud: Référence Materio */
+  /* Field: Content: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
@@ -861,7 +861,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
-  /* Field: Nœud: Manufacturer */
+  /* Field: Content: Manufacturer */
   $handler->display->display_options['fields']['field_company_fab']['id'] = 'field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['table'] = 'field_data_field_company_fab';
   $handler->display->display_options['fields']['field_company_fab']['field'] = 'field_company_fab';
@@ -870,7 +870,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_fab']['alter']['text'] = 'Fab :<br/>
 [field_company_fab] ';
   $handler->display->display_options['fields']['field_company_fab']['delta_offset'] = '0';
-  /* Field: Nœud: Distributor */
+  /* Field: Content: Distributor */
   $handler->display->display_options['fields']['field_company_distrib']['id'] = 'field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['table'] = 'field_data_field_company_distrib';
   $handler->display->display_options['fields']['field_company_distrib']['field'] = 'field_company_distrib';
@@ -878,7 +878,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_company_distrib']['alter']['text'] = 'Distrib : <br />
 [field_company_distrib]';
   $handler->display->display_options['fields']['field_company_distrib']['delta_offset'] = '0';
-  /* Field: Nœud: Onthologie */
+  /* Field: Content: Onthologie */
   $handler->display->display_options['fields']['field_onthologie']['id'] = 'field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['table'] = 'field_data_field_onthologie';
   $handler->display->display_options['fields']['field_onthologie']['field'] = 'field_onthologie';
@@ -886,7 +886,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_onthologie']['delta_limit'] = '5';
   $handler->display->display_options['fields']['field_onthologie']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_onthologie']['multi_type'] = 'ol';
-  /* Field: Nœud: Tags libres */
+  /* Field: Content: Tags libres */
   $handler->display->display_options['fields']['field_tags_libres']['id'] = 'field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['table'] = 'field_data_field_tags_libres';
   $handler->display->display_options['fields']['field_tags_libres']['field'] = 'field_tags_libres';
@@ -894,7 +894,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_tags_libres']['delta_limit'] = '4';
   $handler->display->display_options['fields']['field_tags_libres']['delta_offset'] = '0';
   $handler->display->display_options['fields']['field_tags_libres']['multi_type'] = 'ul';
-  /* Field: Nœud: Materiau(x) lié(s) */
+  /* Field: Content: Materiau(x) lié(s) */
   $handler->display->display_options['fields']['field_materiau_ref']['id'] = 'field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['table'] = 'field_data_field_materiau_ref';
   $handler->display->display_options['fields']['field_materiau_ref']['field'] = 'field_materiau_ref';
@@ -905,7 +905,7 @@ function materio_administration_views_default_views() {
     'link' => 1,
   );
   $handler->display->display_options['fields']['field_materiau_ref']['delta_offset'] = '0';
-  /* Field: Nœud: Brève(s) liée(s) */
+  /* Field: Content: Brève(s) liée(s) */
   $handler->display->display_options['fields']['field_breve_ref']['id'] = 'field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['table'] = 'field_data_field_breve_ref';
   $handler->display->display_options['fields']['field_breve_ref']['field'] = 'field_breve_ref';
@@ -923,13 +923,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Field: Nœud: Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Field: Nœud: Localisation */
+  /* Field: Content: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
@@ -1025,7 +1025,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Nœud: Famille (field_famille) */
+  /* Filter criterion: Content: Famille (field_famille) */
   $handler->display->display_options['filters']['field_famille_value']['id'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['table'] = 'field_data_field_famille';
   $handler->display->display_options['filters']['field_famille_value']['field'] = 'field_famille_value';
@@ -1036,7 +1036,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_famille_value']['expose']['operator'] = 'field_famille_value_op';
   $handler->display->display_options['filters']['field_famille_value']['expose']['identifier'] = 'field_famille_value';
   $handler->display->display_options['filters']['field_famille_value']['expose']['remember'] = TRUE;
-  /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
+  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1047,7 +1047,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['label'] = 'Référence';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['operator'] = 'field_reference_materio_value_op';
   $handler->display->display_options['filters']['field_reference_materio_value']['expose']['identifier'] = 'field_reference_materio_value';
-  /* Filter criterion: Nœud: Localisation (field_localisation) */
+  /* Filter criterion: Content: Localisation (field_localisation) */
   $handler->display->display_options['filters']['field_localisation_value']['id'] = 'field_localisation_value';
   $handler->display->display_options['filters']['field_localisation_value']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['filters']['field_localisation_value']['field'] = 'field_localisation_value';
@@ -1214,7 +1214,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: Nœud: Adresse */
+  /* Field: Content: Adresse */
   $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
   $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1225,7 +1225,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Nœud: Phone */
+  /* Field: Content: Phone */
   $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
@@ -1247,21 +1247,21 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['translate']['field'] = 'translate';
   $handler->display->display_options['fields']['translate']['exclude'] = TRUE;
   $handler->display->display_options['fields']['translate']['not'] = 0;
-  /* Field: Nœud: website */
+  /* Field: Content: website */
   $handler->display->display_options['fields']['field_website']['id'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['table'] = 'field_data_field_website';
   $handler->display->display_options['fields']['field_website']['field'] = 'field_website';
   $handler->display->display_options['fields']['field_website']['click_sort_column'] = 'url';
-  /* Field: Nœud: Email */
+  /* Field: Content: Email */
   $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
   $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
-  /* Field: Nœud: Note */
+  /* Field: Content: Note */
   $handler->display->display_options['fields']['field_note']['id'] = 'field_note';
   $handler->display->display_options['fields']['field_note']['table'] = 'field_data_field_note';
   $handler->display->display_options['fields']['field_note']['field'] = 'field_note';
-  /* Field: Nœud: Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
@@ -1336,7 +1336,7 @@ function materio_administration_views_default_views() {
     'looping_embed_video' => 'looping_embed_video',
   );
   $handler->display->display_options['filters']['type_2']['group'] = 1;
-  /* Filter criterion: Nœud: Adresse - Postal code */
+  /* Filter criterion: Content: Adresse - Postal code */
   $handler->display->display_options['filters']['field_public_address_postal_code']['id'] = 'field_public_address_postal_code';
   $handler->display->display_options['filters']['field_public_address_postal_code']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_postal_code']['field'] = 'field_public_address_postal_code';
@@ -1359,7 +1359,7 @@ function materio_administration_views_default_views() {
     3 => 0,
     4 => 0,
   );
-  /* Filter criterion: Nœud: Adresse - Locality (i.e. City) */
+  /* Filter criterion: Content: Adresse - Locality (i.e. City) */
   $handler->display->display_options['filters']['field_public_address_locality']['id'] = 'field_public_address_locality';
   $handler->display->display_options['filters']['field_public_address_locality']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['filters']['field_public_address_locality']['field'] = 'field_public_address_locality';
@@ -1457,13 +1457,13 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_memo']['alter']['max_length'] = '300';
   $handler->display->display_options['fields']['field_memo']['alter']['strip_tags'] = TRUE;
   $handler->display->display_options['fields']['field_memo']['alter']['trim'] = TRUE;
-  /* Field: Nœud: Fichiers joints */
+  /* Field: Content: Fichiers joints */
   $handler->display->display_options['fields']['field_attachments']['id'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['table'] = 'field_data_field_attachments';
   $handler->display->display_options['fields']['field_attachments']['field'] = 'field_attachments';
   $handler->display->display_options['fields']['field_attachments']['click_sort_column'] = 'fid';
   $handler->display->display_options['fields']['field_attachments']['delta_offset'] = '0';
-  /* Field: Nœud: Localisation */
+  /* Field: Content: Localisation */
   $handler->display->display_options['fields']['field_localisation']['id'] = 'field_localisation';
   $handler->display->display_options['fields']['field_localisation']['table'] = 'field_data_field_localisation';
   $handler->display->display_options['fields']['field_localisation']['field'] = 'field_localisation';
@@ -1559,7 +1559,7 @@ function materio_administration_views_default_views() {
     4 => 0,
   );
   $handler->display->display_options['filters']['type']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Nœud: Référence Materio (field_reference_materio) */
+  /* Filter criterion: Content: Référence Materio (field_reference_materio) */
   $handler->display->display_options['filters']['field_reference_materio_value']['id'] = 'field_reference_materio_value';
   $handler->display->display_options['filters']['field_reference_materio_value']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['filters']['field_reference_materio_value']['field'] = 'field_reference_materio_value';
@@ -1724,7 +1724,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nid']['label'] = '';
   $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['nid']['element_label_colon'] = FALSE;
-  /* Field: Nœud: Showroom */
+  /* Field: Content: Showroom */
   $handler->display->display_options['fields']['field_tode_showroom']['id'] = 'field_tode_showroom';
   $handler->display->display_options['fields']['field_tode_showroom']['table'] = 'field_data_field_tode_showroom';
   $handler->display->display_options['fields']['field_tode_showroom']['field'] = 'field_tode_showroom';
@@ -1740,16 +1740,16 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['nothing']['field'] = 'nothing';
   $handler->display->display_options['fields']['nothing']['label'] = 'Translation';
   $handler->display->display_options['fields']['nothing']['alter']['text'] = '<span class="node-edit"><a href="/node/[nid]/translate">translate</a></span>';
-  /* Field: Nœud: Email */
+  /* Field: Content: Email */
   $handler->display->display_options['fields']['field_public_email']['id'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['table'] = 'field_data_field_public_email';
   $handler->display->display_options['fields']['field_public_email']['field'] = 'field_public_email';
   $handler->display->display_options['fields']['field_public_email']['label'] = 'Courriel';
-  /* Field: Nœud: Phone */
+  /* Field: Content: Phone */
   $handler->display->display_options['fields']['field_public_phone']['id'] = 'field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['table'] = 'field_data_field_public_phone';
   $handler->display->display_options['fields']['field_public_phone']['field'] = 'field_public_phone';
-  /* Field: Nœud: Adresse */
+  /* Field: Content: Adresse */
   $handler->display->display_options['fields']['field_public_address']['id'] = 'field_public_address';
   $handler->display->display_options['fields']['field_public_address']['table'] = 'field_data_field_public_address';
   $handler->display->display_options['fields']['field_public_address']['field'] = 'field_public_address';
@@ -1760,7 +1760,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Nœud: Body */
+  /* Field: Content: Body */
   $handler->display->display_options['fields']['body']['id'] = 'body';
   $handler->display->display_options['fields']['body']['table'] = 'field_data_body';
   $handler->display->display_options['fields']['body']['field'] = 'body';
@@ -2194,7 +2194,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['header']['result']['table'] = 'views';
   $handler->display->display_options['header']['result']['field'] = 'result';
   $handler->display->display_options['header']['result']['label'] = 'Résumé';
-  /* Relationship: User: Profil */
+  /* Relationship: User: Profile */
   $handler->display->display_options['relationships']['profile']['id'] = 'profile';
   $handler->display->display_options['relationships']['profile']['table'] = 'users';
   $handler->display->display_options['relationships']['profile']['field'] = 'profile';
@@ -2248,19 +2248,19 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profil: Title */
+  /* Field: Profile: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profil: First name */
+  /* Field: Profile: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profil: Name */
+  /* Field: Profile: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2290,18 +2290,18 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: Utilisateur: Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profil: Organization */
+  /* Field: Profile: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profil: service */
+  /* Field: Profile: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2310,7 +2310,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profil: Quality */
+  /* Field: Profile: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2319,7 +2319,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profil: SIRET */
+  /* Field: Profile: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2327,7 +2327,7 @@ function materio_administration_views_default_views() {
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profil: Employee */
+  /* Field: Profile: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2341,14 +2341,14 @@ function materio_administration_views_default_views() {
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profil: Website */
+  /* Field: Profile: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profil: Adresse */
+  /* Field: Profile: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2360,7 +2360,7 @@ function materio_administration_views_default_views() {
       'address' => 'address',
     ),
   );
-  /* Field: Profil: Phone */
+  /* Field: Profile: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2494,7 +2494,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Utilisateur: Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2506,7 +2506,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profil: Organization (field_organization) */
+  /* Filter criterion: Profile: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -2683,19 +2683,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profil: Title */
+  /* Field: Profile: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profil: First name */
+  /* Field: Profile: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profil: Name */
+  /* Field: Profile: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -2721,18 +2721,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: Utilisateur: Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profil: Organization */
+  /* Field: Profile: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profil: service */
+  /* Field: Profile: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -2741,7 +2741,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profil: Quality */
+  /* Field: Profile: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -2750,7 +2750,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profil: SIRET */
+  /* Field: Profile: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -2758,7 +2758,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profil: Employee */
+  /* Field: Profile: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -2772,14 +2772,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profil: Website */
+  /* Field: Profile: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profil: Adresse */
+  /* Field: Profile: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -2791,7 +2791,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profil: Phone */
+  /* Field: Profile: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -2902,7 +2902,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Utilisateur: Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -2914,7 +2914,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profil: Organization (field_organization) */
+  /* Filter criterion: Profile: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3081,7 +3081,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['edit_node']['field'] = 'edit_node';
   $handler->display->display_options['fields']['edit_node']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['edit_node']['alter']['text'] = '<span class="node-edit">[edit_node]</span>';
-  /* Field: Utilisateur: Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
@@ -3216,7 +3216,7 @@ print user_pass_reset_url($account);
     13 => 0,
   );
   $handler->display->display_options['filters']['rid_1']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Utilisateur: Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3362,19 +3362,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profil: Title */
+  /* Field: Profile: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profil: First name */
+  /* Field: Profile: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profil: Name */
+  /* Field: Profile: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3400,18 +3400,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: Utilisateur: Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profil: Organization */
+  /* Field: Profile: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profil: service */
+  /* Field: Profile: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3420,7 +3420,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profil: Quality */
+  /* Field: Profile: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3429,7 +3429,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profil: SIRET */
+  /* Field: Profile: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3437,7 +3437,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profil: Employee */
+  /* Field: Profile: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3451,14 +3451,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profil: Website */
+  /* Field: Profile: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profil: Adresse */
+  /* Field: Profile: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3470,7 +3470,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profil: Phone */
+  /* Field: Profile: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -3581,7 +3581,7 @@ print user_pass_reset_url($account);
     4 => 0,
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
-  /* Filter criterion: Utilisateur: Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3593,7 +3593,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profil: Organization (field_organization) */
+  /* Filter criterion: Profile: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -3749,19 +3749,19 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['uid']['exclude'] = TRUE;
   $handler->display->display_options['fields']['uid']['element_label_colon'] = FALSE;
   $handler->display->display_options['fields']['uid']['link_to_user'] = FALSE;
-  /* Field: Profil: Title */
+  /* Field: Profile: Title */
   $handler->display->display_options['fields']['field_private_name_title']['id'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['table'] = 'field_data_field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['field'] = 'field_private_name_title';
   $handler->display->display_options['fields']['field_private_name_title']['relationship'] = 'profile';
-  /* Field: Profil: First name */
+  /* Field: Profile: First name */
   $handler->display->display_options['fields']['field_first_name']['id'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['table'] = 'field_data_field_first_name';
   $handler->display->display_options['fields']['field_first_name']['field'] = 'field_first_name';
   $handler->display->display_options['fields']['field_first_name']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_first_name']['label'] = 'Prénom';
   $handler->display->display_options['fields']['field_first_name']['exclude'] = TRUE;
-  /* Field: Profil: Name */
+  /* Field: Profile: Name */
   $handler->display->display_options['fields']['field_name']['id'] = 'field_name';
   $handler->display->display_options['fields']['field_name']['table'] = 'field_data_field_name';
   $handler->display->display_options['fields']['field_name']['field'] = 'field_name';
@@ -3787,18 +3787,18 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['expiration']['date_format'] = 'custom';
   $handler->display->display_options['fields']['expiration']['custom_date_format'] = 'Y-m-d';
   $handler->display->display_options['fields']['expiration']['second_date_format'] = 'long';
-  /* Field: Utilisateur: Company */
+  /* Field: User: Company */
   $handler->display->display_options['fields']['field_company']['id'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['table'] = 'field_data_field_company';
   $handler->display->display_options['fields']['field_company']['field'] = 'field_company';
   $handler->display->display_options['fields']['field_company']['label'] = 'Société';
-  /* Field: Profil: Organization */
+  /* Field: Profile: Organization */
   $handler->display->display_options['fields']['field_organization']['id'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['table'] = 'field_data_field_organization';
   $handler->display->display_options['fields']['field_organization']['field'] = 'field_organization';
   $handler->display->display_options['fields']['field_organization']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_organization']['label'] = 'Organisation';
-  /* Field: Profil: service */
+  /* Field: Profile: service */
   $handler->display->display_options['fields']['field_service']['id'] = 'field_service';
   $handler->display->display_options['fields']['field_service']['table'] = 'field_data_field_service';
   $handler->display->display_options['fields']['field_service']['field'] = 'field_service';
@@ -3807,7 +3807,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_service']['alter']['text'] = 'service : [field_service]';
   $handler->display->display_options['fields']['field_service']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_service']['empty_zero'] = TRUE;
-  /* Field: Profil: Quality */
+  /* Field: Profile: Quality */
   $handler->display->display_options['fields']['field_private_quality']['id'] = 'field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['table'] = 'field_data_field_private_quality';
   $handler->display->display_options['fields']['field_private_quality']['field'] = 'field_private_quality';
@@ -3816,7 +3816,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_private_quality']['alter']['text'] = 'quality : [field_private_quality]';
   $handler->display->display_options['fields']['field_private_quality']['hide_empty'] = TRUE;
   $handler->display->display_options['fields']['field_private_quality']['empty_zero'] = TRUE;
-  /* Field: Profil: SIRET */
+  /* Field: Profile: SIRET */
   $handler->display->display_options['fields']['field_siret']['id'] = 'field_siret';
   $handler->display->display_options['fields']['field_siret']['table'] = 'field_data_field_siret';
   $handler->display->display_options['fields']['field_siret']['field'] = 'field_siret';
@@ -3824,7 +3824,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['fields']['field_siret']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['field_siret']['alter']['text'] = 'siret : [field_siret]';
   $handler->display->display_options['fields']['field_siret']['hide_empty'] = TRUE;
-  /* Field: Profil: Employee */
+  /* Field: Profile: Employee */
   $handler->display->display_options['fields']['field_employee']['id'] = 'field_employee';
   $handler->display->display_options['fields']['field_employee']['table'] = 'field_data_field_employee';
   $handler->display->display_options['fields']['field_employee']['field'] = 'field_employee';
@@ -3838,14 +3838,14 @@ print user_pass_reset_url($account);
     'thousand_separator' => ' ',
     'prefix_suffix' => 1,
   );
-  /* Field: Profil: Website */
+  /* Field: Profile: Website */
   $handler->display->display_options['fields']['field_user_website']['id'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['table'] = 'field_data_field_user_website';
   $handler->display->display_options['fields']['field_user_website']['field'] = 'field_user_website';
   $handler->display->display_options['fields']['field_user_website']['relationship'] = 'profile';
   $handler->display->display_options['fields']['field_user_website']['label'] = 'Site internet';
   $handler->display->display_options['fields']['field_user_website']['click_sort_column'] = 'url';
-  /* Field: Profil: Adresse */
+  /* Field: Profile: Adresse */
   $handler->display->display_options['fields']['field_adresse']['id'] = 'field_adresse';
   $handler->display->display_options['fields']['field_adresse']['table'] = 'field_data_field_adresse';
   $handler->display->display_options['fields']['field_adresse']['field'] = 'field_adresse';
@@ -3857,7 +3857,7 @@ print user_pass_reset_url($account);
       'address' => 'address',
     ),
   );
-  /* Field: Profil: Phone */
+  /* Field: Profile: Phone */
   $handler->display->display_options['fields']['field_private_phone']['id'] = 'field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['table'] = 'field_data_field_private_phone';
   $handler->display->display_options['fields']['field_private_phone']['field'] = 'field_private_phone';
@@ -3959,7 +3959,7 @@ print user_pass_reset_url($account);
   );
   $handler->display->display_options['filters']['rid']['expose']['reduce'] = TRUE;
   $handler->display->display_options['filters']['rid']['reduce_duplicates'] = TRUE;
-  /* Filter criterion: Utilisateur: Company (field_company) */
+  /* Filter criterion: User: Company (field_company) */
   $handler->display->display_options['filters']['field_company_tid']['id'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['table'] = 'field_data_field_company';
   $handler->display->display_options['filters']['field_company_tid']['field'] = 'field_company_tid';
@@ -3971,7 +3971,7 @@ print user_pass_reset_url($account);
   $handler->display->display_options['filters']['field_company_tid']['expose']['operator'] = 'field_company_tid_op';
   $handler->display->display_options['filters']['field_company_tid']['expose']['identifier'] = 'field_company_tid';
   $handler->display->display_options['filters']['field_company_tid']['vocabulary'] = 'company';
-  /* Filter criterion: Profil: Organization (field_organization) */
+  /* Filter criterion: Profile: Organization (field_organization) */
   $handler->display->display_options['filters']['field_organization_value']['id'] = 'field_organization_value';
   $handler->display->display_options['filters']['field_organization_value']['table'] = 'field_data_field_organization';
   $handler->display->display_options['filters']['field_organization_value']['field'] = 'field_organization_value';
@@ -4105,7 +4105,7 @@ print user_pass_reset_url($account);
     t('dernier »'),
     t('Résumé'),
     t('Displaying @start - @end of @total'),
-    t('Profil'),
+    t('Profile'),
     t('Utilisateur'),
     t('- Choose an operation -'),
     t('Title'),
@@ -4387,7 +4387,7 @@ print user_pass_reset_url($account);
     3 => 0,
     4 => 0,
   );
-  /* Filter criterion: Terme de taxonomie: Nom (name_field) */
+  /* Filter criterion: Taxonomy term: Nom (name_field) */
   $handler->display->display_options['filters']['name_field_value']['id'] = 'name_field_value';
   $handler->display->display_options['filters']['name_field_value']['table'] = 'field_data_name_field';
   $handler->display->display_options['filters']['name_field_value']['field'] = 'name_field_value';
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
index 916935bc..d1c60a42 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_base.inc
@@ -517,6 +517,9 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'deleted' => 0,
     'entity_types' => array(),
     'field_name' => 'field_nature_titre',
+    'field_permissions' => array(
+      'type' => 2,
+    ),
     'indexes' => array(
       'format' => array(
         0 => 'format',
@@ -527,6 +530,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
     'settings' => array(
       'entity_translation_sync' => FALSE,
       'max_length' => 255,
+      'profile2_private' => FALSE,
     ),
     'translatable' => 1,
     'type' => 'text',
@@ -1036,7 +1040,7 @@ foreach ($states as $state) {
     'entity_types' => array(),
     'field_name' => 'title_field',
     'field_permissions' => array(
-      'type' => 0,
+      'type' => 2,
     ),
     'indexes' => array(
       'format' => array(
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
index 60eea862..f58c0c41 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.field_instance.inc
@@ -2473,7 +2473,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'hidden',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 13,
+        'weight' => 16,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2526,7 +2526,7 @@ function materio_content_types_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'entityreference_autocomplete',
-      'weight' => 28,
+      'weight' => 10,
     ),
   );
 
@@ -2842,7 +2842,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 6,
+        'weight' => 11,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2923,7 +2923,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 7,
+        'weight' => 12,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -2970,7 +2970,7 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'computed_field',
       'settings' => array(),
       'type' => 'computed',
-      'weight' => 2,
+      'weight' => 3,
     ),
   );
 
@@ -3270,7 +3270,7 @@ function materio_content_types_field_default_field_instances() {
         'size' => 60,
       ),
       'type' => 'entityreference_autocomplete',
-      'weight' => 27,
+      'weight' => 9,
     ),
   );
 
@@ -3303,7 +3303,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 9,
+        'weight' => 14,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3479,7 +3479,7 @@ function materio_content_types_field_default_field_instances() {
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 8,
+        'weight' => 13,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3624,7 +3624,7 @@ function materio_content_types_field_default_field_instances() {
       'module' => 'computed_field',
       'settings' => array(),
       'type' => 'computed',
-      'weight' => 3,
+      'weight' => 4,
     ),
   );
 
@@ -3658,7 +3658,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 11,
+        'weight' => 15,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3828,7 +3828,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'label' => 'above',
         'settings' => array(),
         'type' => 'hidden',
-        'weight' => 0,
+        'weight' => 8,
       ),
       'cardsmall' => array(
         'label' => 'above',
@@ -3878,7 +3878,7 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
         'formatter_settings' => array(),
       ),
       'type' => 'field_extrawidgets_read_only',
-      'weight' => 29,
+      'weight' => 11,
     ),
   );
 
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc b/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
index dd8e7f8f..f30bbc7b 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc
@@ -104,7 +104,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['create field_displayed_in_home'] = array(
     'name' => 'create field_displayed_in_home',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -147,7 +146,6 @@ function materio_content_types_user_default_permissions() {
     'name' => 'create field_localisation',
     'roles' => array(
       'administrator' => 'administrator',
-      'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -265,7 +263,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit field_displayed_in_home'] = array(
     'name' => 'edit field_displayed_in_home',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -306,8 +303,8 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit field_localisation'] = array(
     'name' => 'edit field_localisation',
     'roles' => array(
+      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
-      'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -422,7 +419,6 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit own field_displayed_in_home'] = array(
     'name' => 'edit own field_displayed_in_home',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -463,7 +459,7 @@ function materio_content_types_user_default_permissions() {
   $permissions['edit own field_localisation'] = array(
     'name' => 'edit own field_localisation',
     'roles' => array(
-      'root' => 'root',
+      'administrator' => 'administrator',
     ),
     'module' => 'field_permissions',
   );
@@ -559,7 +555,6 @@ function materio_content_types_user_default_permissions() {
       'Adhérent' => 'Adhérent',
       'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
-      'Showroom' => 'Showroom',
       'Student' => 'Student',
       'administrator' => 'administrator',
       'root' => 'root',
@@ -737,11 +732,8 @@ function materio_content_types_user_default_permissions() {
   $permissions['view field_localisation'] = array(
     'name' => 'view field_localisation',
     'roles' => array(
-      'Adhérent' => 'Adhérent',
-      'Premium' => 'Premium',
-      'Student' => 'Student',
+      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
-      'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
@@ -892,7 +884,7 @@ function materio_content_types_user_default_permissions() {
   $permissions['view own field_localisation'] = array(
     'name' => 'view own field_localisation',
     'roles' => array(
-      'root' => 'root',
+      'administrator' => 'administrator',
     ),
     'module' => 'field_permissions',
   );
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc
index 8dc29343..6c824ee6 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.field_group.inc
@@ -537,7 +537,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'header',
-    'weight' => '0',
+    'weight' => '1',
     'children' => array(
       0 => 'field_nature_titre',
       1 => 'title_field',
@@ -641,6 +641,8 @@ function materio_content_types_field_group_info() {
       2 => 'group_fichiers',
       3 => 'group_media',
       4 => 'group_referencement',
+      5 => 'group_showroom',
+      6 => 'group_liens',
     ),
     'format_type' => 'htabs',
     'format_settings' => array(
@@ -972,6 +974,34 @@ function materio_content_types_field_group_info() {
   );
   $field_groups['group_images|node|materiau|cardsmall'] = $field_group;
 
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_liens|node|materiau|form';
+  $field_group->group_name = 'group_liens';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'materiau';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_htabs';
+  $field_group->data = array(
+    'label' => 'Liens',
+    'weight' => '16',
+    'children' => array(
+      0 => 'field_materiau_ref',
+      1 => 'field_breve_ref',
+    ),
+    'format_type' => 'htab',
+    'format_settings' => array(
+      'formatter' => 'closed',
+      'instance_settings' => array(
+        'description' => '',
+        'classes' => 'group-liens field-group-htab',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $field_groups['group_liens|node|materiau|form'] = $field_group;
+
   $field_group = new stdClass();
   $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
   $field_group->api_version = 1;
@@ -1166,7 +1196,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 1',
-    'weight' => '1',
+    'weight' => '2',
     'children' => array(
       0 => 'group_images',
     ),
@@ -1294,7 +1324,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 2',
-    'weight' => '2',
+    'weight' => '3',
     'children' => array(
       0 => 'field_description',
     ),
@@ -1419,7 +1449,7 @@ function materio_content_types_field_group_info() {
   $field_group->parent_name = '';
   $field_group->data = array(
     'label' => 'side 3',
-    'weight' => '3',
+    'weight' => '10',
     'children' => array(
       0 => 'field_video_filter',
     ),
@@ -1841,6 +1871,7 @@ function materio_content_types_field_group_info() {
   t('Contenus');
   t('Fichiers');
   t('Header');
+  t('Liens');
   t('Médias');
   t('Référencement');
   t('Side left');
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.info b/sites/all/modules/features/materio_content_types/materio_content_types.info
index c619583d..4bdac944 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.info
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.info
@@ -24,6 +24,7 @@ dependencies[] = node
 dependencies[] = options
 dependencies[] = print
 dependencies[] = print_ui
+dependencies[] = showroom
 dependencies[] = strongarm
 dependencies[] = synonyms
 dependencies[] = taxonomy
@@ -103,6 +104,7 @@ features[field_group][] = group_images|node|materiau|cardbig
 features[field_group][] = group_images|node|materiau|cardfull
 features[field_group][] = group_images|node|materiau|cardmedium
 features[field_group][] = group_images|node|materiau|cardsmall
+features[field_group][] = group_liens|node|materiau|form
 features[field_group][] = group_media|node|materiau|form
 features[field_group][] = group_referencement|node|breve|form
 features[field_group][] = group_referencement|node|materiau|form
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
index 86c296d7..a716cfa3 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.strongarm.inc
@@ -346,10 +346,10 @@ function materio_content_types_strongarm() {
           'weight' => '5',
         ),
         'metatags' => array(
-          'weight' => '40',
+          'weight' => '13',
         ),
         'redirect' => array(
-          'weight' => '30',
+          'weight' => '12',
         ),
       ),
       'display' => array(
@@ -381,7 +381,7 @@ function materio_content_types_strongarm() {
         ),
         'workflow_current_state' => array(
           'cardmedium' => array(
-            'weight' => '-99',
+            'weight' => '0',
             'visible' => TRUE,
           ),
           'cardbig' => array(
@@ -407,7 +407,7 @@ function materio_content_types_strongarm() {
         ),
         'workflow' => array(
           'cardmedium' => array(
-            'weight' => '99',
+            'weight' => '7',
             'visible' => TRUE,
           ),
           'cardbig' => array(
@@ -1056,13 +1056,13 @@ function materio_content_types_strongarm() {
   $strongarm->value = array(
     'title' => array(
       'region' => 'main',
-      'weight' => '0',
+      'weight' => '3',
       'has_required' => TRUE,
       'title' => 'Nom',
     ),
     'additional_settings' => array(
       'region' => 'main',
-      'weight' => '9',
+      'weight' => '6',
       'has_required' => FALSE,
       'title' => 'Onglets verticaux',
       'hidden' => 0,
@@ -1076,21 +1076,21 @@ function materio_content_types_strongarm() {
     ),
     'language' => array(
       'region' => 'right',
-      'weight' => '5',
+      'weight' => '7',
       'has_required' => FALSE,
       'title' => 'Langue',
       'hidden' => 0,
     ),
     'field_memo' => array(
       'region' => 'right',
-      'weight' => '7',
+      'weight' => '9',
       'has_required' => FALSE,
       'title' => 'Mémo',
       'hidden' => 0,
     ),
     'field_localisation' => array(
-      'region' => 'right',
-      'weight' => '2',
+      'region' => 'main',
+      'weight' => '14',
       'has_required' => FALSE,
       'title' => 'Localisation',
       'hidden' => 0,
@@ -1109,66 +1109,121 @@ function materio_content_types_strongarm() {
       'hidden' => 0,
     ),
     'field_reference_materio' => array(
-      'region' => 'main',
-      'weight' => '4',
+      'region' => 'right',
+      'weight' => '2',
       'has_required' => FALSE,
       'title' => 'Référence Materio',
       'hidden' => 0,
     ),
     'field_materiau_ref' => array(
       'region' => 'right',
-      'weight' => '3',
+      'weight' => '5',
       'has_required' => FALSE,
       'title' => 'Materiau(x) lié(s)',
       'hidden' => 0,
     ),
     'field_breve_ref' => array(
       'region' => 'right',
-      'weight' => '4',
+      'weight' => '6',
       'has_required' => FALSE,
       'title' => 'Brève(s) liée(s)',
       'hidden' => 0,
     ),
     'field_workflow_state' => array(
       'region' => 'main',
-      'weight' => '13',
+      'weight' => '9',
       'has_required' => FALSE,
       'title' => 'Workflow State',
       'hidden' => 0,
     ),
     'workflow' => array(
       'region' => 'right',
-      'weight' => '6',
+      'weight' => '8',
       'has_required' => FALSE,
       'title' => 'Importé',
       'hidden' => 0,
     ),
     'entity_translation_entity_form_language_update' => array(
       'region' => 'main',
-      'weight' => '0',
+      'weight' => '4',
       'has_required' => FALSE,
       'title' => NULL,
       'hidden' => 0,
     ),
-    'group_htabs' => array(
+    'field_attachments' => array(
+      'region' => 'main',
+      'weight' => '5',
+      'has_required' => FALSE,
+      'title' => 'Fichiers joints',
+      'hidden' => 0,
+    ),
+    'field_description' => array(
+      'region' => 'main',
+      'weight' => '2',
+      'has_required' => FALSE,
+      'title' => 'Description',
+      'hidden' => 0,
+    ),
+    'field_nature_titre' => array(
+      'region' => 'main',
+      'weight' => '1',
+      'has_required' => FALSE,
+      'title' => 'Nature Titre',
+      'hidden' => 0,
+    ),
+    'field_materiau_image' => array(
+      'region' => 'main',
+      'weight' => '7',
+      'has_required' => FALSE,
+      'title' => 'Image',
+      'hidden' => 0,
+    ),
+    'field_video_filter' => array(
+      'region' => 'main',
+      'weight' => '8',
+      'has_required' => FALSE,
+      'title' => 'video',
+      'hidden' => 0,
+    ),
+    'title_field' => array(
       'region' => 'main',
       'weight' => '0',
-      'has_required' => FALSE,
-      'title' => 'htabs (Field group)',
-      'hidden' => 0,
+      'has_required' => TRUE,
+      'title' => 'Nom',
     ),
-    'group_media' => array(
+    'field_tags_libres' => array(
       'region' => 'main',
-      'weight' => '13',
+      'weight' => '11',
       'has_required' => FALSE,
-      'title' => 'Médias (Field group)',
+      'title' => 'Tags libres',
       'hidden' => 0,
     ),
-    'group_referencement' => array(
+    'field_onthologie' => array(
+      'region' => 'main',
+      'weight' => '10',
+      'has_required' => FALSE,
+      'title' => 'Onthologie',
+      'hidden' => 0,
+    ),
+    'field_company_fab' => array(
       'region' => 'main',
       'weight' => '12',
       'has_required' => FALSE,
-      'title' => 'Référencement (Field group)',
+      'title' => 'Fabricant',
+      'hidden' => 0,
+    ),
+    'field_company_distrib' => array(
+      'region' => 'main',
+      'weight' => '13',
+      'has_required' => FALSE,
+      'title' => 'Distributeur',
+      'hidden' => 0,
+    ),
+    'field_showroom_localisation' => array(
+      'region' => 'main',
+      'weight' => '15',
+      'has_required' => FALSE,
+      'title' => 'showroom_localisation',
       'hidden' => 0,
     ),
   );
diff --git a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
index 52546d18..b0846478 100644
--- a/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
+++ b/sites/all/modules/features/materio_content_types/materio_content_types.views_default.inc
@@ -50,7 +50,7 @@ function materio_content_types_views_default_views() {
     'title' => 'title',
   );
   $handler->display->display_options['row_options']['hide_empty'] = TRUE;
-  /* Field: Content: Référence Materio */
+  /* Field: Nœud: Référence Materio */
   $handler->display->display_options['fields']['field_reference_materio']['id'] = 'field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['table'] = 'field_data_field_reference_materio';
   $handler->display->display_options['fields']['field_reference_materio']['field'] = 'field_reference_materio';
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc b/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
index ffcdb602..f61d884d 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
+++ b/sites/all/modules/features/materio_publications/materio_publications.features.user_role.inc
@@ -10,6 +10,12 @@
 function materio_publications_user_default_roles() {
   $roles = array();
 
+  // Exported role: Translator.
+  $roles['Translator'] = array(
+    'name' => 'Translator',
+    'weight' => 9,
+  );
+
   // Exported role: utilisateur anonyme.
   $roles['utilisateur anonyme'] = array(
     'name' => 'utilisateur anonyme',
diff --git a/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc b/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc
index a20c6eab..06b83fb3 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc
+++ b/sites/all/modules/features/materio_publications/materio_publications.features.workflow_access.inc
@@ -22,6 +22,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['(creation)']['Showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['(creation)']['workflow_features_author_name'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -72,6 +77,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['(creation)']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Importé'] = array();
   $workflows['Publication']['Importé']['administrator'] = array(
     'grant_view' => 1,
@@ -83,6 +93,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['Importé']['Showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Importé']['workflow_features_author_name'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -133,6 +148,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Importé']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Édité'] = array();
   $workflows['Publication']['Édité']['Student'] = array(
     'grant_view' => 1,
@@ -159,6 +179,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['Édité']['Showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Édité']['workflow_features_author_name'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -194,6 +219,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Édité']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Masqué'] = array();
   $workflows['Publication']['Masqué']['Utilisateur Alpha Tester'] = array(
     'grant_view' => 1,
@@ -210,6 +240,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['Masqué']['Showroom'] = array(
+    'grant_view' => 1,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Masqué']['workflow_features_author_name'] = array(
     'grant_view' => 1,
     'grant_update' => 1,
@@ -255,6 +290,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Masqué']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Publié'] = array();
   $workflows['Publication']['Publié']['utilisateur anonyme'] = array(
     'grant_view' => 1,
@@ -301,6 +341,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 0,
     'grant_delete' => 0,
   );
+  $workflows['Publication']['Publié']['Translator'] = array(
+    'grant_view' => 0,
+    'grant_update' => 0,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Publié']['administrator'] = array(
     'grant_view' => 0,
     'grant_update' => 1,
@@ -311,6 +356,11 @@ function materio_publications_workflow_access_features_default_settings() {
     'grant_update' => 1,
     'grant_delete' => 1,
   );
+  $workflows['Publication']['Publié']['Showroom'] = array(
+    'grant_view' => 0,
+    'grant_update' => 1,
+    'grant_delete' => 0,
+  );
   $workflows['Publication']['Publié']['workflow_features_author_name'] = array(
     'grant_view' => 0,
     'grant_update' => 1,
diff --git a/sites/all/modules/features/materio_publications/materio_publications.info b/sites/all/modules/features/materio_publications/materio_publications.info
index d5ed86aa..3ec6a5dc 100644
--- a/sites/all/modules/features/materio_publications/materio_publications.info
+++ b/sites/all/modules/features/materio_publications/materio_publications.info
@@ -4,11 +4,13 @@ package = Materio
 dependencies[] = ctools
 dependencies[] = features
 dependencies[] = image
+dependencies[] = list
 dependencies[] = materio_content_types
 dependencies[] = materio_page_title
 dependencies[] = metatag
 dependencies[] = node
 dependencies[] = options
+dependencies[] = showroom
 dependencies[] = strongarm
 dependencies[] = text
 dependencies[] = workflow_access
@@ -27,6 +29,7 @@ features[user_permission][] = delete own publication content
 features[user_permission][] = edit any publication content
 features[user_permission][] = edit own publication content
 features[user_permission][] = show publication title
+features[user_role][] = Translator
 features[user_role][] = utilisateur anonyme
 features[user_role][] = utilisateur authentifié
 features[variable][] = additional_settings__active_tab_publication
diff --git a/sites/all/modules/features/showroom/showroom.features.field_base.inc b/sites/all/modules/features/showroom/showroom.features.field_base.inc
index 2d428bd1..0e7803ac 100644
--- a/sites/all/modules/features/showroom/showroom.features.field_base.inc
+++ b/sites/all/modules/features/showroom/showroom.features.field_base.inc
@@ -64,6 +64,96 @@ function showroom_field_default_field_bases() {
     'type' => 'taxonomy_term_reference',
   );
 
+  // Exported field_base: 'field_showroom_localisation'.
+  $field_bases['field_showroom_localisation'] = array(
+    'active' => 1,
+    'cardinality' => -1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_showroom_localisation',
+    'field_permissions' => array(
+      'type' => 2,
+    ),
+    'indexes' => array(
+      'revision_id' => array(
+        0 => 'revision_id',
+      ),
+      'value' => array(
+        0 => 'value',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'field_collection',
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'hide_blank_items' => 1,
+      'hide_initial_item' => 0,
+      'path' => '',
+      'profile2_private' => FALSE,
+    ),
+    'translatable' => 0,
+    'type' => 'field_collection',
+  );
+
+  // Exported field_base: 'field_showroom_localisation_loca'.
+  $field_bases['field_showroom_localisation_loca'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_showroom_localisation_loca',
+    'field_permissions' => array(
+      'type' => 2,
+    ),
+    'indexes' => array(
+      'format' => array(
+        0 => 'format',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'text',
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'max_length' => 255,
+      'profile2_private' => FALSE,
+    ),
+    'translatable' => 0,
+    'type' => 'text',
+  );
+
+  // Exported field_base: 'field_showroom_localisation_show'.
+  $field_bases['field_showroom_localisation_show'] = array(
+    'active' => 1,
+    'cardinality' => 1,
+    'deleted' => 0,
+    'entity_types' => array(),
+    'field_name' => 'field_showroom_localisation_show',
+    'field_permissions' => array(
+      'type' => 2,
+    ),
+    'indexes' => array(
+      'tid' => array(
+        0 => 'tid',
+      ),
+    ),
+    'locked' => 0,
+    'module' => 'taxonomy',
+    'settings' => array(
+      'allowed_values' => array(
+        0 => array(
+          'vocabulary' => 'showroom',
+          'parent' => 0,
+          'depth' => '',
+        ),
+      ),
+      'entity_translation_sync' => FALSE,
+      'options_list_callback' => 'content_taxonomy_allowed_values',
+      'profile2_private' => FALSE,
+    ),
+    'translatable' => 0,
+    'type' => 'taxonomy_term_reference',
+  );
+
   // Exported field_base: 'field_tode_showroom'.
   $field_bases['field_tode_showroom'] = array(
     'active' => 1,
diff --git a/sites/all/modules/features/showroom/showroom.features.field_instance.inc b/sites/all/modules/features/showroom/showroom.features.field_instance.inc
index e5e98518..96369ba6 100644
--- a/sites/all/modules/features/showroom/showroom.features.field_instance.inc
+++ b/sites/all/modules/features/showroom/showroom.features.field_instance.inc
@@ -10,6 +10,175 @@
 function showroom_field_default_field_instances() {
   $field_instances = array();
 
+  // Exported field_instance:
+  // 'field_collection_item-field_showroom_localisation-field_showroom_localisation_loca'.
+  $field_instances['field_collection_item-field_showroom_localisation-field_showroom_localisation_loca'] = array(
+    'bundle' => 'field_showroom_localisation',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'default' => array(
+        'label' => 'hidden',
+        'module' => 'text',
+        'settings' => array(),
+        'type' => 'text_default',
+        'weight' => 1,
+      ),
+    ),
+    'entity_type' => 'field_collection_item',
+    'field_name' => 'field_showroom_localisation_loca',
+    'label' => 'Localisation',
+    'required' => 0,
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'text_processing' => 0,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'text',
+      'settings' => array(
+        'size' => 60,
+      ),
+      'type' => 'text_textfield',
+      'weight' => 32,
+    ),
+  );
+
+  // Exported field_instance:
+  // 'field_collection_item-field_showroom_localisation-field_showroom_localisation_show'.
+  $field_instances['field_collection_item-field_showroom_localisation-field_showroom_localisation_show'] = array(
+    'bundle' => 'field_showroom_localisation',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '[current-user:field-showroom:tid]',
+    'display' => array(
+      'default' => array(
+        'label' => 'hidden',
+        'module' => 'taxonomy',
+        'settings' => array(),
+        'type' => 'taxonomy_term_reference_plain',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'field_collection_item',
+    'field_name' => 'field_showroom_localisation_show',
+    'label' => 'Showroom',
+    'required' => 0,
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 1,
+      'module' => 'taxonomy',
+      'settings' => array(
+        'autocomplete_path' => 'taxonomy/autocomplete',
+        'content_taxonomy_autocomplete_new_terms' => 'allow',
+        'display_empty' => 1,
+        'formatter' => 'taxonomy_term_reference_link',
+        'formatter_settings' => array(),
+        'size' => 60,
+      ),
+      'type' => 'taxonomy_autocomplete',
+      'weight' => 31,
+    ),
+  );
+
+  // Exported field_instance: 'node-materiau-field_showroom_localisation'.
+  $field_instances['node-materiau-field_showroom_localisation'] = array(
+    'bundle' => 'materiau',
+    'default_value' => NULL,
+    'deleted' => 0,
+    'description' => '',
+    'display' => array(
+      'bookmark' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardbig' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardfull' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'cardmedium' => array(
+        'label' => 'above',
+        'module' => 'field_collection',
+        'settings' => array(
+          'add' => '',
+          'delete' => '',
+          'description' => 1,
+          'edit' => '',
+          'view_mode' => 'full',
+        ),
+        'type' => 'field_collection_view',
+        'weight' => 9,
+      ),
+      'cardsmall' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'default' => array(
+        'label' => 'above',
+        'module' => 'field_collection',
+        'settings' => array(
+          'add' => 'Ajouter',
+          'delete' => 'Supprimer',
+          'description' => TRUE,
+          'edit' => 'Modifier',
+          'view_mode' => 'full',
+        ),
+        'type' => 'field_collection_view',
+        'weight' => 25,
+      ),
+      'homeblock' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'print' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+      'teaser' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
+    ),
+    'entity_type' => 'node',
+    'field_name' => 'field_showroom_localisation',
+    'label' => 'showroom_localisation',
+    'required' => 0,
+    'settings' => array(
+      'entity_translation_sync' => FALSE,
+      'user_register_form' => FALSE,
+    ),
+    'widget' => array(
+      'active' => 0,
+      'module' => 'field_collection',
+      'settings' => array(),
+      'type' => 'field_collection_embed',
+      'weight' => 5,
+    ),
+  );
+
   // Exported field_instance: 'node-showroom-body'.
   $field_instances['node-showroom-body'] = array(
     'bundle' => 'showroom',
@@ -1100,10 +1269,13 @@ function showroom_field_default_field_instances() {
   t('Body');
   t('Description');
   t('Email');
+  t('Localisation');
   t('Mémo');
   t('Nom');
   t('Phone');
   t('Showroom');
+  t('[current-user:field-showroom:tid]');
+  t('showroom_localisation');
 
   return $field_instances;
 }
diff --git a/sites/all/modules/features/showroom/showroom.features.inc b/sites/all/modules/features/showroom/showroom.features.inc
index 1b328eca..bed1183d 100644
--- a/sites/all/modules/features/showroom/showroom.features.inc
+++ b/sites/all/modules/features/showroom/showroom.features.inc
@@ -8,6 +8,9 @@
  * Implements hook_ctools_plugin_api().
  */
 function showroom_ctools_plugin_api($module = NULL, $api = NULL) {
+  if ($module == "field_group" && $api == "field_group") {
+    return array("version" => "1");
+  }
   if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => "1");
   }
diff --git a/sites/all/modules/features/showroom/showroom.features.menu_links.inc b/sites/all/modules/features/showroom/showroom.features.menu_links.inc
new file mode 100644
index 00000000..fab7ff4f
--- /dev/null
+++ b/sites/all/modules/features/showroom/showroom.features.menu_links.inc
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @file
+ * showroom.features.menu_links.inc
+ */
+
+/**
+ * Implements hook_menu_default_menu_links().
+ */
+function showroom_menu_default_menu_links() {
+  $menu_links = array();
+
+  // Exported menu link: navigation_showroom:node/add/showroom.
+  $menu_links['navigation_showroom:node/add/showroom'] = array(
+    'menu_name' => 'navigation',
+    'link_path' => 'node/add/showroom',
+    'router_path' => 'node/add/showroom',
+    'link_title' => 'Showroom',
+    'options' => array(
+      'identifier' => 'navigation_showroom:node/add/showroom',
+    ),
+    'module' => 'system',
+    'hidden' => 0,
+    'external' => 0,
+    'has_children' => 0,
+    'expanded' => 0,
+    'weight' => 0,
+    'customized' => 0,
+    'language' => 'und',
+    'menu_links_customized' => 0,
+  );
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Showroom');
+
+  return $menu_links;
+}
diff --git a/sites/all/modules/features/showroom/showroom.features.user_permission.inc b/sites/all/modules/features/showroom/showroom.features.user_permission.inc
index b3f5818b..19ea69b0 100644
--- a/sites/all/modules/features/showroom/showroom.features.user_permission.inc
+++ b/sites/all/modules/features/showroom/showroom.features.user_permission.inc
@@ -30,6 +30,24 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'create field_showroom_localisation'.
+  $permissions['create field_showroom_localisation'] = array(
+    'name' => 'create field_showroom_localisation',
+    'roles' => array(
+      'Showroom' => 'Showroom',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'create field_showroom_localisation_show'.
+  $permissions['create field_showroom_localisation_show'] = array(
+    'name' => 'create field_showroom_localisation_show',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'create field_tode_showroom'.
   $permissions['create field_tode_showroom'] = array(
     'name' => 'create field_tode_showroom',
@@ -80,6 +98,15 @@ function showroom_user_default_permissions() {
     'module' => 'taxonomy',
   );
 
+  // Exported permission: 'delete users with role 13'.
+  $permissions['delete users with role 13'] = array(
+    'name' => 'delete users with role 13',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'administerusersbyrole',
+  );
+
   // Exported permission: 'edit any showroom content'.
   $permissions['edit any showroom content'] = array(
     'name' => 'edit any showroom content',
@@ -100,6 +127,23 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit field_showroom_localisation'.
+  $permissions['edit field_showroom_localisation'] = array(
+    'name' => 'edit field_showroom_localisation',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit field_showroom_localisation_show'.
+  $permissions['edit field_showroom_localisation_show'] = array(
+    'name' => 'edit field_showroom_localisation_show',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit field_tode_showroom'.
   $permissions['edit field_tode_showroom'] = array(
     'name' => 'edit field_tode_showroom',
@@ -120,6 +164,23 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'edit own field_showroom_localisation'.
+  $permissions['edit own field_showroom_localisation'] = array(
+    'name' => 'edit own field_showroom_localisation',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'edit own field_showroom_localisation_show'.
+  $permissions['edit own field_showroom_localisation_show'] = array(
+    'name' => 'edit own field_showroom_localisation_show',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'edit own field_tode_showroom'.
   $permissions['edit own field_tode_showroom'] = array(
     'name' => 'edit own field_tode_showroom',
@@ -150,6 +211,15 @@ function showroom_user_default_permissions() {
     'module' => 'taxonomy',
   );
 
+  // Exported permission: 'edit users with role 13'.
+  $permissions['edit users with role 13'] = array(
+    'name' => 'edit users with role 13',
+    'roles' => array(
+      'administrator' => 'administrator',
+    ),
+    'module' => 'administerusersbyrole',
+  );
+
   // Exported permission: 'enter showroom revision log entry'.
   $permissions['enter showroom revision log entry'] = array(
     'name' => 'enter showroom revision log entry',
@@ -237,13 +307,32 @@ function showroom_user_default_permissions() {
   $permissions['view field_showroom'] = array(
     'name' => 'view field_showroom',
     'roles' => array(
-      'Showroom' => 'Showroom',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view field_showroom_localisation'.
+  $permissions['view field_showroom_localisation'] = array(
+    'name' => 'view field_showroom_localisation',
+    'roles' => array(
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view field_showroom_localisation_show'.
+  $permissions['view field_showroom_localisation_show'] = array(
+    'name' => 'view field_showroom_localisation_show',
+    'roles' => array(
+      'anonymous user' => 'anonymous user',
+      'authenticated user' => 'authenticated user',
+    ),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view field_tode_showroom'.
   $permissions['view field_tode_showroom'] = array(
     'name' => 'view field_tode_showroom',
@@ -264,6 +353,24 @@ function showroom_user_default_permissions() {
     'module' => 'field_permissions',
   );
 
+  // Exported permission: 'view own field_showroom_localisation'.
+  $permissions['view own field_showroom_localisation'] = array(
+    'name' => 'view own field_showroom_localisation',
+    'roles' => array(
+      'Showroom' => 'Showroom',
+      'administrator' => 'administrator',
+      'root' => 'root',
+    ),
+    'module' => 'field_permissions',
+  );
+
+  // Exported permission: 'view own field_showroom_localisation_show'.
+  $permissions['view own field_showroom_localisation_show'] = array(
+    'name' => 'view own field_showroom_localisation_show',
+    'roles' => array(),
+    'module' => 'field_permissions',
+  );
+
   // Exported permission: 'view own field_tode_showroom'.
   $permissions['view own field_tode_showroom'] = array(
     'name' => 'view own field_tode_showroom',
diff --git a/sites/all/modules/features/showroom/showroom.field_group.inc b/sites/all/modules/features/showroom/showroom.field_group.inc
new file mode 100644
index 00000000..ed84d0b8
--- /dev/null
+++ b/sites/all/modules/features/showroom/showroom.field_group.inc
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @file
+ * showroom.field_group.inc
+ */
+
+/**
+ * Implements hook_field_group_info().
+ */
+function showroom_field_group_info() {
+  $field_groups = array();
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_showroom|node|materiau|form';
+  $field_group->group_name = 'group_showroom';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'materiau';
+  $field_group->mode = 'form';
+  $field_group->parent_name = 'group_htabs';
+  $field_group->data = array(
+    'label' => 'Showroom',
+    'weight' => '17',
+    'children' => array(
+      0 => 'field_localisation',
+      1 => 'field_showroom_localisation',
+    ),
+    'format_type' => 'htab',
+    'format_settings' => array(
+      'formatter' => 'closed',
+      'instance_settings' => array(
+        'description' => '',
+        'classes' => 'group-showroom field-group-htab',
+        'required_fields' => 1,
+      ),
+    ),
+  );
+  $field_groups['group_showroom|node|materiau|form'] = $field_group;
+
+  $field_group = new stdClass();
+  $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */
+  $field_group->api_version = 1;
+  $field_group->identifier = 'group_side6|node|materiau|cardmedium';
+  $field_group->group_name = 'group_side6';
+  $field_group->entity_type = 'node';
+  $field_group->bundle = 'materiau';
+  $field_group->mode = 'cardmedium';
+  $field_group->parent_name = '';
+  $field_group->data = array(
+    'label' => 'side 6',
+    'weight' => '6',
+    'children' => array(
+      0 => 'field_showroom_localisation',
+    ),
+    'format_type' => 'div',
+    'format_settings' => array(
+      'label' => 'side 6',
+      'instance_settings' => array(
+        'id' => '',
+        'classes' => 'side group-side6 field-group-div',
+        'description' => '',
+        'show_label' => '0',
+        'label_element' => 'h3',
+        'effect' => 'none',
+        'speed' => 'fast',
+      ),
+      'formatter' => 'open',
+    ),
+  );
+  $field_groups['group_side6|node|materiau|cardmedium'] = $field_group;
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Showroom');
+  t('side 6');
+
+  return $field_groups;
+}
diff --git a/sites/all/modules/features/showroom/showroom.info b/sites/all/modules/features/showroom/showroom.info
index 34e5ba2b..ba7a020b 100644
--- a/sites/all/modules/features/showroom/showroom.info
+++ b/sites/all/modules/features/showroom/showroom.info
@@ -7,10 +7,15 @@ dependencies[] = cck_phone
 dependencies[] = ctools
 dependencies[] = email
 dependencies[] = features
+dependencies[] = field_collection
+dependencies[] = field_group
 dependencies[] = field_permissions
 dependencies[] = materio_content_types
 dependencies[] = materio_page_title
+dependencies[] = materio_showroom
 dependencies[] = materio_subscriptions
+dependencies[] = materio_user_profiles
+dependencies[] = menu
 dependencies[] = metatag
 dependencies[] = node
 dependencies[] = options
@@ -22,11 +27,20 @@ dependencies[] = taxonomy
 dependencies[] = term_merge
 dependencies[] = text
 dependencies[] = tode
+features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
 features[field_base][] = description_field
 features[field_base][] = field_showroom
+features[field_base][] = field_showroom_localisation
+features[field_base][] = field_showroom_localisation_loca
+features[field_base][] = field_showroom_localisation_show
 features[field_base][] = field_tode_showroom
+features[field_group][] = group_showroom|node|materiau|form
+features[field_group][] = group_side6|node|materiau|cardmedium
+features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_loca
+features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_show
+features[field_instance][] = node-materiau-field_showroom_localisation
 features[field_instance][] = node-showroom-body
 features[field_instance][] = node-showroom-field_memo
 features[field_instance][] = node-showroom-field_public_address
@@ -36,23 +50,32 @@ features[field_instance][] = node-showroom-field_tode_showroom
 features[field_instance][] = taxonomy_term-showroom-description_field
 features[field_instance][] = taxonomy_term-showroom-name_field
 features[field_instance][] = user-user-field_showroom
+features[menu_links][] = navigation_showroom:node/add/showroom
 features[node][] = showroom
 features[rules_config][] = rules_auto_tag_news_with_showroom
 features[taxonomy][] = showroom
 features[user_permission][] = assign Showroom role
 features[user_permission][] = create field_showroom
+features[user_permission][] = create field_showroom_localisation
+features[user_permission][] = create field_showroom_localisation_show
 features[user_permission][] = create field_tode_showroom
 features[user_permission][] = create showroom content
 features[user_permission][] = delete any showroom content
 features[user_permission][] = delete own showroom content
 features[user_permission][] = delete terms in showroom
+features[user_permission][] = delete users with role 13
 features[user_permission][] = edit any showroom content
 features[user_permission][] = edit field_showroom
+features[user_permission][] = edit field_showroom_localisation
+features[user_permission][] = edit field_showroom_localisation_show
 features[user_permission][] = edit field_tode_showroom
 features[user_permission][] = edit own field_showroom
+features[user_permission][] = edit own field_showroom_localisation
+features[user_permission][] = edit own field_showroom_localisation_show
 features[user_permission][] = edit own field_tode_showroom
 features[user_permission][] = edit own showroom content
 features[user_permission][] = edit terms in showroom
+features[user_permission][] = edit users with role 13
 features[user_permission][] = enter showroom revision log entry
 features[user_permission][] = merge showroom terms
 features[user_permission][] = override showroom authored by option
@@ -63,8 +86,12 @@ features[user_permission][] = override showroom revision option
 features[user_permission][] = override showroom sticky option
 features[user_permission][] = show showroom title
 features[user_permission][] = view field_showroom
+features[user_permission][] = view field_showroom_localisation
+features[user_permission][] = view field_showroom_localisation_show
 features[user_permission][] = view field_tode_showroom
 features[user_permission][] = view own field_showroom
+features[user_permission][] = view own field_showroom_localisation
+features[user_permission][] = view own field_showroom_localisation_show
 features[user_permission][] = view own field_tode_showroom
 features[user_role][] = Showroom
 features[variable][] = additional_settings__active_tab_showroom
@@ -79,6 +106,7 @@ features[variable][] = diff_show_preview_changes_node_showroom
 features[variable][] = diff_view_mode_preview_node_showroom
 features[variable][] = entity_translation_hide_translation_links_showroom
 features[variable][] = entity_translation_node_metadata_showroom
+features[variable][] = field_bundle_settings_field_collection_item__field_showroom_localisation
 features[variable][] = field_bundle_settings_node__showroom
 features[variable][] = i18n_node_extended_showroom
 features[variable][] = i18n_node_options_showroom
diff --git a/sites/all/modules/features/showroom/showroom.strongarm.inc b/sites/all/modules/features/showroom/showroom.strongarm.inc
index 9d4654e1..753e9fdf 100644
--- a/sites/all/modules/features/showroom/showroom.strongarm.inc
+++ b/sites/all/modules/features/showroom/showroom.strongarm.inc
@@ -98,6 +98,36 @@ return t($items[0][\'name\']);
   $strongarm->value = '0';
   $export['entity_translation_node_metadata_showroom'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'field_bundle_settings_field_collection_item__field_showroom_localisation';
+  $strongarm->value = array(
+    'view_modes' => array(
+      'full' => array(
+        'custom_settings' => FALSE,
+      ),
+      'diff_standard' => array(
+        'custom_settings' => FALSE,
+      ),
+      'print' => array(
+        'custom_settings' => FALSE,
+      ),
+      'token' => array(
+        'custom_settings' => FALSE,
+      ),
+    ),
+    'extra_fields' => array(
+      'form' => array(
+        'redirect' => array(
+          'weight' => '30',
+        ),
+      ),
+      'display' => array(),
+    ),
+  );
+  $export['field_bundle_settings_field_collection_item__field_showroom_localisation'] = $strongarm;
+
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;