Fix merge

src/FTTHBundle/Admin/OLTAdmin.php

@@ -66,7 +66,13 @@ class OLTAdmin extends WorkflowBaseAdmin
                 ->tab('default')
                     ->with('')
                         ->add('name')
-                        ->add('model')
+                        ->add('model', null, [
+                            'query_builder' => function($qb) {
+                                return $qb->createQueryBuilder('o')
+                                    ->orderBy('o.name', 'ASC')
+                                    ;
+                            },
+                        ])
                     ->end()
                 ->end()
                 ->tab('configuration')

src/FTTHBundle/Utils/OLTModelMark.php

@@ -18,5 +18,7 @@ class OLTModelMark
     const ZTE = 'ZTE';
 
     const CALIX = 'Calix';
+    
+    const FURUKAWA = 'Furukawa';
 
 }