Merge branch '3.7' into 3.8

Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc

lib/classes/API/V1/adapter.php

@@ -393,6 +393,9 @@ class API_V1_adapter extends API_V1_Abstract
                 'navigator'    => array(
                     'active'   => $app['phraseanet.registry']->get('GV_client_navigator'),
                 ),
+                'office-plugin' => array(
+                    'active'    => $registry->get('GV_client_navigator'),
+                ),
                 'homepage' => array(
                     'viewType' => $app['phraseanet.registry']->get('GV_home_publi'),
                 ),