diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index b371c25ee9..8b6a59c254 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -1224,60 +1224,70 @@
 		$vendors[$y]['uuid'] = "6baf1a7e-7a43-4a66-9007-bbb911bf947b";
 		$vendors[$y]['name'] = "polycom";
 		$z=0;
+		$vendors[$y]['functions'][$z]['uuid'] = "15d0c92d-91e9-43e9-b35d-85f1d5e35fff";
 		$vendors[$y]['functions'][$z]['label'] = "label-line";
 		$vendors[$y]['functions'][$z]['name'] = "line";
 		$vendors[$y]['functions'][$z]['value'] = "line";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "f18e9a26-09e3-476f-8bd4-35a257a6872b";
 		$vendors[$y]['functions'][$z]['label'] = "label-automata";
 		$vendors[$y]['functions'][$z]['name'] = "automata";
 		$vendors[$y]['functions'][$z]['value'] = "automata";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "617e4474-c381-4ef8-950a-2b29b67ed8e3";
 		$vendors[$y]['functions'][$z]['label'] = "label-normal";
 		$vendors[$y]['functions'][$z]['name'] = "normal";
 		$vendors[$y]['functions'][$z]['value'] = "normal";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "6f8ac180-b741-4c94-9d45-87fa39fe340b";
 		$vendors[$y]['functions'][$z]['label'] = "label-messages";
 		$vendors[$y]['functions'][$z]['name'] = "messages";
 		$vendors[$y]['functions'][$z]['value'] = "Messages";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "b0ae3068-fc45-44cf-b052-b8705740acb2";
 		$vendors[$y]['functions'][$z]['label'] = "label-micmute";
 		$vendors[$y]['functions'][$z]['name'] = "micmute";
 		$vendors[$y]['functions'][$z]['value'] = "MicMute";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "d9cdb61a-3821-4a3a-833b-5beaab212997";
 		$vendors[$y]['functions'][$z]['label'] = "label-redial";
 		$vendors[$y]['functions'][$z]['name'] = "redial";
 		$vendors[$y]['functions'][$z]['value'] = "Redial";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "202352b8-beac-4861-8220-4489533c3679";
 		$vendors[$y]['functions'][$z]['label'] = "label-null";
 		$vendors[$y]['functions'][$z]['name'] = "null";
 		$vendors[$y]['functions'][$z]['value'] = "Null";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "75f4f5fa-f4e8-4680-ac6f-a69846708569";
 		$vendors[$y]['functions'][$z]['label'] = "label-speeddial";
 		$vendors[$y]['functions'][$z]['name'] = "speeddial";
 		$vendors[$y]['functions'][$z]['value'] = "SpeedDial";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "ab4cf4e2-6e10-485a-964d-f66f7cfd2c85";
 		$vendors[$y]['functions'][$z]['label'] = "label-speeddialmenu";
 		$vendors[$y]['functions'][$z]['name'] = "speeddialmenu";
 		$vendors[$y]['functions'][$z]['value'] = "SpeedDialMenu";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "0205cce8-2796-4f3d-97c0-dbe51add6270";
 		$vendors[$y]['functions'][$z]['label'] = "label-url";
 		$vendors[$y]['functions'][$z]['name'] = "url";
 		$vendors[$y]['functions'][$z]['value'] = "URL";
@@ -1285,165 +1295,192 @@
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 
 		$y++;
-		$vendors[$y]['uuid'] = "";
+		$vendors[$y]['uuid'] = "a287e444-95e0-47c4-9742-0a8cec73c799";
 		$vendors[$y]['name'] = "aastra";
 		$z=0;
+		$vendors[$y]['functions'][$z]['uuid'] = "913b6eca-3795-4d7d-9403-bbf56276afd4";
 		$vendors[$y]['functions'][$z]['label'] = "label-none";
 		$vendors[$y]['functions'][$z]['name'] = "none";
 		$vendors[$y]['functions'][$z]['value'] = "none";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "e2f048a2-441d-4488-89cf-ef3b573189b8";
 		$vendors[$y]['functions'][$z]['label'] = "label-empty";
 		$vendors[$y]['functions'][$z]['name'] = "empty";
 		$vendors[$y]['functions'][$z]['value'] = "empty";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "8dd7f00e-8f0a-4b73-aa51-98a1ade5b670";
 		$vendors[$y]['functions'][$z]['label'] = "label-blf";
 		$vendors[$y]['functions'][$z]['name'] = "blf";
 		$vendors[$y]['functions'][$z]['value'] = "blf";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "c921464e-f7cb-45f7-8dd8-8b8bf3c00ae1";
 		$vendors[$y]['functions'][$z]['label'] = "label-blf_xfer";
 		$vendors[$y]['functions'][$z]['name'] = "blf_xfer";
 		$vendors[$y]['functions'][$z]['value'] = "blfxfer";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "41a6ce08-39ad-4476-b83f-df53e5425114";
 		$vendors[$y]['functions'][$z]['label'] = "label-blf_list";
 		$vendors[$y]['functions'][$z]['name'] = "blf_list";
 		$vendors[$y]['functions'][$z]['value'] = "list";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "d0a67640-951c-4587-b266-fc27b1e290db";
 		$vendors[$y]['functions'][$z]['label'] = "label-callers";
 		$vendors[$y]['functions'][$z]['name'] = "callers";
 		$vendors[$y]['functions'][$z]['value'] = "callers";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "62320c4e-e68d-43bb-b29a-0e08af9e0855";
 		$vendors[$y]['functions'][$z]['label'] = "label-call_forward";
 		$vendors[$y]['functions'][$z]['name'] = "call_forward";
 		$vendors[$y]['functions'][$z]['value'] = "callforward";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "d919273a-4500-45d0-ba59-f544e3766815";
 		$vendors[$y]['functions'][$z]['label'] = "label-conf";
 		$vendors[$y]['functions'][$z]['name'] = "conf";
 		$vendors[$y]['functions'][$z]['value'] = "conf";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "abeeedea-9a2f-4092-8884-f8e9f3f7fce0";
 		$vendors[$y]['functions'][$z]['label'] = "label-dnd";
 		$vendors[$y]['functions'][$z]['name'] = "dnd";
 		$vendors[$y]['functions'][$z]['value'] = "dnd";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "b5e56de3-65b4-44e9-8f4b-8943c0ddfd50";
 		$vendors[$y]['functions'][$z]['label'] = "label-directory";
 		$vendors[$y]['functions'][$z]['name'] = "directory";
 		$vendors[$y]['functions'][$z]['value'] = "directory";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "3111a723-0e2e-4627-bcdc-c6f19a6b8836";
 		$vendors[$y]['functions'][$z]['label'] = "label-flash";
 		$vendors[$y]['functions'][$z]['name'] = "flash";
 		$vendors[$y]['functions'][$z]['value'] = "flash";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "7daaf215-4396-4535-9a27-57d1ce67904b";
 		$vendors[$y]['functions'][$z]['label'] = "label-filter";
 		$vendors[$y]['functions'][$z]['name'] = "filter";
 		$vendors[$y]['functions'][$z]['value'] = "filter";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "b2eb0361-b7fa-43bb-a481-e041dd76c91f";
 		$vendors[$y]['functions'][$z]['label'] = "label-icom";
 		$vendors[$y]['functions'][$z]['name'] = "icom";
 		$vendors[$y]['functions'][$z]['value'] = "icom";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "5869b457-97b3-4e52-9a38-435347d039f4";
 		$vendors[$y]['functions'][$z]['label'] = "label-lcr";
 		$vendors[$y]['functions'][$z]['name'] = "lcr";
 		$vendors[$y]['functions'][$z]['value'] = "lcr";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "dc4f8dcc-7922-4b74-aa69-188dc84046c2";
 		$vendors[$y]['functions'][$z]['label'] = "label-line";
 		$vendors[$y]['functions'][$z]['name'] = "line";
 		$vendors[$y]['functions'][$z]['value'] = "line";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "11ff4c26-ca8a-4fa8-ab5e-7a175de644ea";
 		$vendors[$y]['functions'][$z]['label'] = "label-page";
 		$vendors[$y]['functions'][$z]['name'] = "page";
 		$vendors[$y]['functions'][$z]['value'] = "paging";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "75481dd7-171c-42f0-8202-37ba9bba29b5";
 		$vendors[$y]['functions'][$z]['label'] = "label-park";
 		$vendors[$y]['functions'][$z]['name'] = "park";
 		$vendors[$y]['functions'][$z]['value'] = "park";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "10342103-7f20-4811-89a0-7227dad9f91a";
 		$vendors[$y]['functions'][$z]['label'] = "label-phonelock";
 		$vendors[$y]['functions'][$z]['name'] = "phonelock";
 		$vendors[$y]['functions'][$z]['value'] = "phonelock";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "a91d0cfb-f175-4012-a687-6f7c7a500d5d";
 		$vendors[$y]['functions'][$z]['label'] = "label-pickup";
 		$vendors[$y]['functions'][$z]['name'] = "pickup";
 		$vendors[$y]['functions'][$z]['value'] = "pickup";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "caf029fd-ffca-466a-9019-ff3c89ecda08";
 		$vendors[$y]['functions'][$z]['label'] = "label-redial";
 		$vendors[$y]['functions'][$z]['name'] = "redial";
 		$vendors[$y]['functions'][$z]['value'] = "redial";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "bf9f3003-7593-419f-87b2-ff54e8890d93";
 		$vendors[$y]['functions'][$z]['label'] = "label-sprecode";
 		$vendors[$y]['functions'][$z]['name'] = "sprecode";
 		$vendors[$y]['functions'][$z]['value'] = "sprecode";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "d539860f-7dfb-4922-805f-9d5d2363a5d4";
 		$vendors[$y]['functions'][$z]['label'] = "label-speed_dial";
 		$vendors[$y]['functions'][$z]['name'] = "speed_dial";
 		$vendors[$y]['functions'][$z]['value'] = "speeddial";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "16aa117d-0dd9-4954-b24a-e8f3403acd6c";
 		$vendors[$y]['functions'][$z]['label'] = "label-speed_dial_xfer";
 		$vendors[$y]['functions'][$z]['name'] = "speed_dial_xfer";
 		$vendors[$y]['functions'][$z]['value'] = "speeddialxfer";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "358589e9-8be0-4931-a329-7a9e902ab4b8";
 		$vendors[$y]['functions'][$z]['label'] = "label-speed_dial_conf";
 		$vendors[$y]['functions'][$z]['name'] = "speed_dial_conf";
 		$vendors[$y]['functions'][$z]['value'] = "speeddialconf";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "2b9245f8-f3ac-4af1-b679-8506ac069ff4";
 		$vendors[$y]['functions'][$z]['label'] = "label-speed_dial_mwi";
 		$vendors[$y]['functions'][$z]['name'] = "speed_dial_mwi";
 		$vendors[$y]['functions'][$z]['value'] = "speeddialmwi";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "6dfc8f00-b813-4424-9a6f-fe3e15ff976a";
 		$vendors[$y]['functions'][$z]['label'] = "label-xfer";
 		$vendors[$y]['functions'][$z]['name'] = "xfer";
 		$vendors[$y]['functions'][$z]['value'] = "xfer";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "c6208fd1-b81e-4349-a2f1-769710df41df";
 		$vendors[$y]['functions'][$z]['label'] = "label-xml";
 		$vendors[$y]['functions'][$z]['name'] = "xml";
 		$vendors[$y]['functions'][$z]['value'] = "xml";
@@ -1451,7 +1488,7 @@
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 
 		$y++;
-		$vendors[$y]['uuid'] = "";
+		$vendors[$y]['uuid'] = "cbedd8ac-e3f0-45ac-9fd8-dc3089ca133a";
 		$vendors[$y]['name'] = "cisco";
 		$z=0;
 		$vendors[$y]['functions'][$z]['label'] = "label-blf";