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

Conflicts:
	composer.lock

composer.lock

@@ -1335,7 +1335,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/Webservice.git",
-                "reference": "f13697392198b317cea8159e4e5750b1bc845550"
+                "reference": "e23812da25460ad4fa03a21b8ce8fc679bed9b65"
             },
             "require": {
                 "ext-curl": "*",
@@ -1348,7 +1348,7 @@
                 }
             },
             "description": "The Flowdat3 Webservice Rest",
-            "time": "2017-04-19 14:47:10"
+            "time": "2017-04-19 15:34:35"
         },
         {
             "name": "ik/workflow-bundle",

src/FTTHBundle/Entity/OLT.php

@@ -297,12 +297,12 @@ class OLT
 
     public function getWorkflowObject() 
     {
-        //if($this->model) {
-        //    $model = $this->model;
-        //    if($model->getWorkflow()) {
-        //        return $model->getWorkflow();
-        //    }
-        //}
+        if($this->model) {
+            $model = $this->model;
+            if($model->getWorkflow()) {
+                return $model->getWorkflow();
+            }
+        }
 
         return null;
     }

src/FTTHBundle/Entity/OLTModel.php

@@ -126,5 +126,4 @@ class OLTModel
         
         return $this;
     }
-
 }