Merge branch 'master' of bitbucket.org:ikflowdat/ftth into workflow_update

Dockerfile

@@ -39,5 +39,5 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
  	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
 	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-    composer run-script post-install-cmd --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0
+        composer run-script post-install-cmd --no-interaction ;\
+ 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0 

app/config/config.yml

@@ -22,6 +22,8 @@ imports:
     - { resource: "@MapBundle/Resources/config/services.yml" }
     - { resource: "@AuthBundle/Resources/config/services.yml" }
     - { resource: "@AuditBundle/Resources/config/services.yml" }
+    - { resource: '@BaseAdminBundle/Resources/config/sonata-config.yml' }
+
 
 parameters:
     app_name: ftth