Merge branch 'FD3-176' of https://bitbucket.org/ikflowdat/ftth into FD3-176

app/config/security.yml

@@ -44,4 +44,4 @@ security:
     access_control:
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/admin/, role: ROLE_ADMIN }
-        - { path: ^/api/,   role: ROLE_ADMIN}
+        - { path: ^/api, role: ROLE_USER }

src/FTTHBundle/Form/ONUType.php

@@ -21,7 +21,12 @@ class ONUType extends AbstractType
                 ->add('administrativeState')
                 ->add('currentState')
                 ->add('transitionState')
+<<<<<<< HEAD
                 ->add('tenancyId');
+=======
+                ->add('tenancyId')
+                ;
+>>>>>>> 6c6e40a55ca66b75a066bae7765121e9a89259ff
     }
     
     /**