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

Conflicts:
	composer.lock

composer.lock

@@ -1333,7 +1333,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "1bd5e00e8cf3d89756bac925f6522982f5e8047d"
+                "reference": "1f3f691964b13643810230574447d2cb0b570b53"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1363,7 +1363,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-04-10 12:53:16"
+            "time": "2017-04-10 18:31:45"
         },
         {
             "name": "incenteev/composer-parameter-handler",