Merge remote-tracking branch 'origin/master' into FD3-176

composer.lock

@@ -1397,7 +1397,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "639796d804ed14a357c84bd04c7e4d26a3db49c2"
+                "reference": "1b0e8111d52e22171fec5386c55bf75d21a2f8dd"
             },
             "type": "library",
             "autoload": {
@@ -1412,7 +1412,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-08-22 14:56:19"
+            "time": "2017-08-24 15:21:23"
         },
         {
             "name": "ik/device-bundle",