Merge branch 'master' of ssh://infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle

Conflicts:
	Utils/DeviceTypes.php

Utils/DeviceTypes.php

@@ -12,10 +12,9 @@ class DeviceTypes
     const FTTH_ONU = 'FTTHBundle\Entity\ONU';
 
     const RADIUS_NAS = 'RadiusBundle\Entity\NAS';
-    
-    const DOCSIS_CMTS = 'CablemodemBundle\Entity\CMTS';
-    
-    const DOCSIS_CABLEMODEM = 'CablemodemBundle\Entity\Cablemodem';
 
+    const CABLEMODEM_CMTS = 'CablemodemBundle\Entity\CMTS';
+
+    const CABLEMODEM_CM = 'CablemodemBundle\Entity\Cablemodem';
 
 }