Merge branch 'master' of ../application-blanche

Conflicts:
	config/application.config.php
	server_config/site.alias

diff --cc config/application.config.php
index 1dab349,846b7b7..9f36ab0
--- 1/config/application.config.php
--- 2/config/application.config.php
+++ b/config/application.config.php
@@@ -2,7 -2,7 +2,8 @@@
  return array(
      'modules' => array(
          'Application',
+         'Auth',
 +        'Galerie',
      ),
      'module_listener_options' => array(
          'config_glob_paths'    => array(

diff --cc vendor/zf2biz/Custom/Model/EntityManager.php
Simple merge