From c405bfa7455c5ba95b8d9c2f12c7e3f2a597cce7 Mon Sep 17 00:00:00 2001
From: Nuno Miguel Reis <nmsreis@gmail.com>
Date: Thu, 17 Oct 2013 22:06:53 +0000
Subject: [PATCH] language translations for pt-pt and some other minor fixes
 and updates

---
 app/adminer/app_config.php            |   1 -
 app/call_center/app_config.php        |   5 +-
 app/calls_active/app_config.php       |   4 +-
 app/conference_centers/app_config.php |   3 +
 app/dialplan/app_config.php           |   3 +-
 app/exec/app_config.php               |   5 +-
 app/extensions/app_config.php         |   4 +-
 app/fax/app_config.php                |   6 +
 app/fifo/app_config.php               |   3 +-
 app/fifo_list/app_config.php          |   3 +-
 app/follow_me/app_config.php          |   3 +-
 app/gateways/app_config.php           |   3 +-
 app/hot_desking/app_config.php        |   3 +-
 app/log_viewer/app_config.php         |   5 +-
 app/modules/app_config.php            |   3 +-
 app/music_on_hold/app_config.php      |   4 +-
 app/recordings/app_config.php         |   3 +-
 app/registrations/app_config.php      |   4 +-
 app/ring_groups/app_config.php        |   5 +-
 app/schemas/app_config.php            |   4 +-
 app/services/app_config.php           |   1 +
 app/settings/app_config.php           |   3 +-
 app/sip_profiles/app_config.php       |   3 +-
 app/sip_status/app_config.php         |   4 +-
 app/sql_query/app_config.php          |   3 +-
 app/system/app_config.php             |   8 +-
 app/time_conditions/app_config.php    |   5 +-
 app/traffic_graph/app_config.php      |   3 +-
 app/vars/app_config.php               |   3 +-
 app/voicemails/app_config.php         |   3 +-
 app/xml_cdr/app_config.php            |   5 +-
 core/apps/app_config.php              | 111 ++--
 core/databases/app_config.php         | 183 +++----
 core/default_settings/app_config.php  | 127 ++---
 core/domain_settings/app_config.php   | 200 ++++----
 core/menu/app_config.php              | 568 ++++++++++-----------
 core/upgrade/app_config.php           | 131 ++---
 core/user_settings/app_config.php     |  77 +--
 core/users/app_config.php             | 695 +++++++++++++-------------
 39 files changed, 1133 insertions(+), 1074 deletions(-)

diff --git a/app/adminer/app_config.php b/app/adminer/app_config.php
index a8470d0b0f..17157f5ad0 100644
--- a/app/adminer/app_config.php
+++ b/app/adminer/app_config.php
@@ -37,7 +37,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "adminer";
-		//$apps[$x]['permissions'][0]['menu']['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
 		$apps[$x]['permissions'][0]['menu']['uuid'] = "1f59d07b-b4f7-4f9e-bde9-312cf491d66e";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
diff --git a/app/call_center/app_config.php b/app/call_center/app_config.php
index 851a9550d5..304df3b492 100644
--- a/app/call_center/app_config.php
+++ b/app/call_center/app_config.php
@@ -94,7 +94,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_center_tier_view";
-		$apps[$x]['permissions'][$y]['menu']['uuid'] = "";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "6c072b29-5b6c-49fc-008e-95e24c77de99";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -112,6 +112,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_center_log_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "6c072b29-5b6c-49fc-008e-95e24c77de99";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -505,4 +506,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/calls_active/app_config.php b/app/calls_active/app_config.php
index c3b5fb0157..f650ed6df5 100644
--- a/app/calls_active/app_config.php
+++ b/app/calls_active/app_config.php
@@ -93,13 +93,13 @@
 		$apps[$x]['permissions'][9]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][10]['name'] = "extension_active_list_view";
-		$apps[$x]['permissions'][10]['menu']['uuid'] = "";
+		$apps[$x]['permissions'][10]['menu']['uuid'] = "6dd85c19-cb6b-5cca-bf32-499bbe936f79";
 		//$apps[$x]['permissions'][10]['groups'][] = "user";
 		$apps[$x]['permissions'][10]['groups'][] = "admin";
 		$apps[$x]['permissions'][10]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][11]['name'] = "extension_active_assigned_view";
-		$apps[$x]['permissions'][11]['menu']['uuid'] = "";
+		$apps[$x]['permissions'][11]['menu']['uuid'] = "6dd85c19-cb6b-5cca-bf32-499bbe936f79";
 		//$apps[$x]['permissions'][11]['groups'][] = "user";
 		$apps[$x]['permissions'][11]['groups'][] = "admin";
 		$apps[$x]['permissions'][11]['groups'][] = "superadmin";
diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php
index 4516ce10bc..25eb4aae17 100644
--- a/app/conference_centers/app_config.php
+++ b/app/conference_centers/app_config.php
@@ -57,6 +57,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_room_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -77,6 +78,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_session_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -143,6 +145,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_session_detail_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
diff --git a/app/dialplan/app_config.php b/app/dialplan/app_config.php
index dfe39c9c0a..19fc26f305 100644
--- a/app/dialplan/app_config.php
+++ b/app/dialplan/app_config.php
@@ -78,6 +78,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "dialplan_detail_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "b94e8bd9-9eb5-e427-9c26-ff7a6c21552a";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -202,4 +203,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/exec/app_config.php b/app/exec/app_config.php
index bc8645f940..6189c4412e 100644
--- a/app/exec/app_config.php
+++ b/app/exec/app_config.php
@@ -37,11 +37,14 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "exec_command_line";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "06493580-9131-ce57-23cd-d42d69dd8526";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "exec_php_command";
+		$apps[$x]['permissions'][1]['menu']['uuid'] = "06493580-9131-ce57-23cd-d42d69dd8526";
 		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][2]['name'] = "exec_switch";
+		$apps[$x]['permissions'][2]['menu']['uuid'] = "06493580-9131-ce57-23cd-d42d69dd8526";
 		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index e486bb3e71..e15cdbf8ee 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -39,6 +39,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "extension_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "d3036a99-9a9f-2ad6-a82a-1fe7bebbe2d3";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -62,6 +63,7 @@
 		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "extension_user_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "d3036a99-9a9f-2ad6-a82a-1fe7bebbe2d3";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -346,4 +348,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_users";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-?>
+?>
\ No newline at end of file
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index dc4b6d7ca9..c1d0b59265 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -39,6 +39,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][$y]['name'] = "fax_extension_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -57,6 +58,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "fax_inbox_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -67,6 +69,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "fax_sent_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -82,6 +85,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "fax_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -99,6 +103,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "fax_user_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";;
 		$y++;
@@ -115,6 +120,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "fax_log_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "9c9642e4-2b9b-2785-18d0-6c0a4ede2b2f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
diff --git a/app/fifo/app_config.php b/app/fifo/app_config.php
index a1ca895863..70c8dac9d5 100644
--- a/app/fifo/app_config.php
+++ b/app/fifo/app_config.php
@@ -38,6 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "fifo_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "c535ac0b-1da1-0f9c-4653-7934c6f4732c";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
@@ -51,4 +52,4 @@
 		$apps[$x]['permissions'][3]['name'] = "fifo_delete";
 		$apps[$x]['permissions'][3]['groups'][] = "admin";
 		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/fifo_list/app_config.php b/app/fifo_list/app_config.php
index 0c9400f122..b0c31ebb8f 100644
--- a/app/fifo_list/app_config.php
+++ b/app/fifo_list/app_config.php
@@ -38,6 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "active_queue_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "450f1225-9187-49ac-a119-87bc26025f7d";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
@@ -52,4 +53,4 @@
 		$apps[$x]['permissions'][3]['name'] = "active_queue_delete";
 		$apps[$x]['permissions'][3]['groups'][] = "admin";
 		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/follow_me/app_config.php b/app/follow_me/app_config.php
index 11a9b2720e..56e52b54dd 100644
--- a/app/follow_me/app_config.php
+++ b/app/follow_me/app_config.php
@@ -40,6 +40,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "follow_me_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "a1144e12-873e-4722-9818-02da1adb6ba3";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -158,4 +159,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "";
 		$z++;
-?>
+?>
\ No newline at end of file
diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php
index 498fa4bfa7..f2209e3684 100644
--- a/app/gateways/app_config.php
+++ b/app/gateways/app_config.php
@@ -37,6 +37,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "gateway_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "237a512a-f8fe-1ce4-b5d7-e71c401d7159";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "gateway_add";
@@ -189,4 +190,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/hot_desking/app_config.php b/app/hot_desking/app_config.php
index 1fe341eea9..9c6df204b8 100644
--- a/app/hot_desking/app_config.php
+++ b/app/hot_desking/app_config.php
@@ -37,6 +37,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "hot_desk_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "baa57691-37d4-4c7d-b227-f2929202b480";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "hot_desk_add";
@@ -48,4 +49,4 @@
 		$apps[$x]['permissions'][3]['name'] = "hot_desk_delete";
 		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/log_viewer/app_config.php b/app/log_viewer/app_config.php
index 04b49f6aed..8c19fd4db9 100644
--- a/app/log_viewer/app_config.php
+++ b/app/log_viewer/app_config.php
@@ -37,9 +37,12 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "log_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "781ebbec-a55a-9d60-f7bb-f54ab2ee4e7e";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
+		
 		$apps[$x]['permissions'][1]['name'] = "log_download";
 		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
+		
 		$apps[$x]['permissions'][2]['name'] = "log_path_view";
 		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/modules/app_config.php b/app/modules/app_config.php
index ded73f41ba..061259507d 100644
--- a/app/modules/app_config.php
+++ b/app/modules/app_config.php
@@ -37,6 +37,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "module_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "49fdb4e1-5417-0e7a-84b3-eb77f5263ea7";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "module_add";
@@ -102,4 +103,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/music_on_hold/app_config.php b/app/music_on_hold/app_config.php
index f3d4e46862..52d6a27fee 100644
--- a/app/music_on_hold/app_config.php
+++ b/app/music_on_hold/app_config.php
@@ -38,6 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "music_on_hold_default_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "1cd1d6cb-912d-db32-56c3-e0d5699feb9d";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "music_on_hold_default_add";
@@ -47,6 +48,7 @@
 		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][3]['name'] = "music_on_hold_view";
+		$apps[$x]['permissions'][3]['menu']['uuid'] = "1cd1d6cb-912d-db32-56c3-e0d5699feb9d";
 		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][3]['groups'][] = "admin";
 
@@ -58,4 +60,4 @@
 		$apps[$x]['permissions'][5]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][5]['groups'][] = "admin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php
index 02a33e6cc5..4183c033c4 100644
--- a/app/recordings/app_config.php
+++ b/app/recordings/app_config.php
@@ -38,6 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "recording_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "e4290fd2-3ccc-a758-1714-660d38453104";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
@@ -115,4 +116,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/registrations/app_config.php b/app/registrations/app_config.php
index a0bff8e244..03a8e4a568 100644
--- a/app/registrations/app_config.php
+++ b/app/registrations/app_config.php
@@ -38,10 +38,12 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "registration_domain";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "17dbfd56-291d-8c1c-bc43-713283a9dd5a";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "registration_all";
+		$apps[$x]['permissions'][1]['menu']['uuid'] = "17dbfd56-291d-8c1c-bc43-713283a9dd5a";
 		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php
index fafdfa1fd0..609411f7a7 100644
--- a/app/ring_groups/app_config.php
+++ b/app/ring_groups/app_config.php
@@ -27,7 +27,7 @@
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Groupes de sonnerie";
 		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
 		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Grupos de Trabalho";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = "Grupos de Ring";
 		$apps[$x]['menu'][0]['title']['pt-br'] = "";
 		$apps[$x]['menu'][0]['uuid'] = "b30f085f-3ec6-2819-7e62-53dfba5cb8d5";
 		$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
@@ -40,6 +40,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "ring_group_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "b30f085f-3ec6-2819-7e62-53dfba5cb8d5";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -247,4 +248,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_users";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-?>
+?>
\ No newline at end of file
diff --git a/app/schemas/app_config.php b/app/schemas/app_config.php
index 13d0948490..98138aaf24 100644
--- a/app/schemas/app_config.php
+++ b/app/schemas/app_config.php
@@ -38,6 +38,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "schema_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "6be94b46-2126-947f-2365-0bea23651a6b";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "schema_add";
@@ -50,6 +51,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "schema_data_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "6be94b46-2126-947f-2365-0bea23651a6b";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "schema_data_add";
@@ -453,4 +455,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/services/app_config.php b/app/services/app_config.php
index 41fde6d722..c49c297873 100644
--- a/app/services/app_config.php
+++ b/app/services/app_config.php
@@ -37,6 +37,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "service_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "c28f14e9-e5ad-e992-0931-d5f5f0db6a79";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "service_add";
diff --git a/app/settings/app_config.php b/app/settings/app_config.php
index a5b15ec822..16bed90aaa 100644
--- a/app/settings/app_config.php
+++ b/app/settings/app_config.php
@@ -38,6 +38,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "setting_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "148ea42a-3711-3d64-181b-07a6a3c3ed60";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "setting_edit";
@@ -145,4 +146,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/sip_profiles/app_config.php b/app/sip_profiles/app_config.php
index 159c9513ed..8f7dd5fd00 100644
--- a/app/sip_profiles/app_config.php
+++ b/app/sip_profiles/app_config.php
@@ -38,6 +38,7 @@
 	//permission details
                 $y = 0;
                 $apps[$x]['permissions'][$y]['name'] = "sip_profile_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "47014b1d-13ad-921c-313d-ca42c0424b37";
                 $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
                 $y++;
                 $apps[$x]['permissions'][$y]['name'] = "sip_profile_add";
@@ -123,4 +124,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
 		$z++;
-?>
+?>
\ No newline at end of file
diff --git a/app/sip_status/app_config.php b/app/sip_status/app_config.php
index 50e2c1b879..c84fcfdeba 100644
--- a/app/sip_status/app_config.php
+++ b/app/sip_status/app_config.php
@@ -37,11 +37,13 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "system_status_sofia_status";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "b7aea9f7-d3cf-711f-828e-46e56e2e5328";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "system_status_sofia_status_profile";
+		$apps[$x]['permissions'][1]['menu']['uuid'] = "b7aea9f7-d3cf-711f-828e-46e56e2e5328";
 		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][2]['name'] = "sip_status_switch_status";
 		$apps[$x]['permissions'][2]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/sql_query/app_config.php b/app/sql_query/app_config.php
index 15d2cb0967..d7cc22c779 100644
--- a/app/sql_query/app_config.php
+++ b/app/sql_query/app_config.php
@@ -37,8 +37,9 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "sql_query_execute";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "a894fed7-5a17-f695-c3de-e32ce58b3794";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
 		$apps[$x]['permissions'][1]['name'] = "sql_query_backup";
 		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/system/app_config.php b/app/system/app_config.php
index 8486e71816..f5f15f89b4 100644
--- a/app/system/app_config.php
+++ b/app/system/app_config.php
@@ -38,21 +38,27 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "system_view_info";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "system_view_cpu";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "system_view_hdd";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "system_view_ram";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "system_view_backup";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "software_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "5243e0d2-0e8b-277a-912e-9d8b5fcdb41d";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "software_add";
@@ -90,4 +96,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php
index 7c350fe50e..a9df04b99b 100644
--- a/app/time_conditions/app_config.php
+++ b/app/time_conditions/app_config.php
@@ -27,7 +27,7 @@
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Conditions Temporelles";
 		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
 		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
-		$apps[$x]['menu'][0]['title']['pt-pt'] = "Condições de tempo";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = "Condições Temporais";
 		$apps[$x]['menu'][0]['title']['pt-br'] = "";
 		$apps[$x]['menu'][0]['uuid'] = "67aede56-8623-df2d-6338-ecfbde5825f7";
 		$apps[$x]['menu'][0]['parent_uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
@@ -38,6 +38,7 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "time_condition_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "67aede56-8623-df2d-6338-ecfbde5825f7";
 		$apps[$x]['permissions'][0]['groups'][] = "admin";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
@@ -52,4 +53,4 @@
 		$apps[$x]['permissions'][3]['name'] = "time_condition_delete";
 		$apps[$x]['permissions'][3]['groups'][] = "admin";
 		$apps[$x]['permissions'][3]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/traffic_graph/app_config.php b/app/traffic_graph/app_config.php
index ca5e7ff522..84cc1e5b7d 100644
--- a/app/traffic_graph/app_config.php
+++ b/app/traffic_graph/app_config.php
@@ -37,5 +37,6 @@
 
 	//permission details
 		$apps[$x]['permissions'][0]['name'] = "traffic_graph_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "05ac3828-dc2b-c0e2-282c-79920f5349e0";
 		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
-?>
+?>
\ No newline at end of file
diff --git a/app/vars/app_config.php b/app/vars/app_config.php
index 51990d6e0f..b0e1ec7f64 100644
--- a/app/vars/app_config.php
+++ b/app/vars/app_config.php
@@ -38,6 +38,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "var_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "7a4e9ec5-24b9-7200-89b8-d70bf8afdd8f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "var_add";
@@ -105,4 +106,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 05a051a56b..4aaf9f54a6 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -42,6 +42,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "voicemail_message_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "0347f82a-62a0-49d0-bacd-511d080c46d5";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
@@ -158,4 +159,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Voicemail message priority.";
 		$z++;
-?>
+?>
\ No newline at end of file
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index e949fdc668..e22c1e0b94 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -59,8 +59,7 @@
 	//permission details
 		$y = 0;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_view";
-		$apps[$x]['permissions'][$y]['menu']['uuid'][] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
-		$apps[$x]['permissions'][$y]['menu']['uuid'][] = "8f80e71a-31a5-6432-47a0-7f5a7b271f05";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "8f80e71a-31a5-6432-47a0-7f5a7b271f05";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -327,4 +326,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Save who hung up or cancelled the leg.";
 
-?>
+?>
\ No newline at end of file
diff --git a/core/apps/app_config.php b/core/apps/app_config.php
index 10f82ee4d4..72bb714ac7 100644
--- a/core/apps/app_config.php
+++ b/core/apps/app_config.php
@@ -1,76 +1,77 @@
 <?php
 	//application details
-		$apps[$x]['name'] = 'App Manager';
-		$apps[$x]['uuid'] = 'd8704214-75a0-e52f-1336-f0780e29fef8';
-		$apps[$x]['category'] = '';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = '';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
-		$apps[$x]['description']['fr-fr'] = '';
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = '';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['name'] = "App Manager";
+		$apps[$x]['uuid'] = "d8704214-75a0-e52f-1336-f0780e29fef8";
+		$apps[$x]['category'] = "";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
+		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "";
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'App Manager';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "App Manager";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion App";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Gestor de Aplicações';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'ef00f229-7890-00c2-bf23-fed5b8fa9fe7';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/apps/apps.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de Aplicações";
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "ef00f229-7890-00c2-bf23-fed5b8fa9fe7";
+		$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/apps/apps.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'app_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "app_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "ef00f229-7890-00c2-bf23-fed5b8fa9fe7";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'app_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "app_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'app_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "app_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'app_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "app_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_apps';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'app_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$apps[$x]['db'][$y]['table'] = "v_apps";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "app_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'app_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "app_category";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'app_version';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "app_version";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'app_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "app_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = "";
 		$z++;
 
-?>
+?>
\ No newline at end of file
diff --git a/core/databases/app_config.php b/core/databases/app_config.php
index 3e68606f69..32ec76655b 100644
--- a/core/databases/app_config.php
+++ b/core/databases/app_config.php
@@ -1,121 +1,122 @@
 <?php
 	//application details
-		$apps[$x]['name'] = 'Databases';
-		$apps[$x]['uuid'] = '8d229b6d-1383-fcec-74c6-4ce1682479e2';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['name'] = "Databases";
+		$apps[$x]['uuid'] = "8d229b6d-1383-fcec-74c6-4ce1682479e2";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Storeds database connection information.";
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Information de connexions au BDD";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Armazena informações de conexão com a base de dados.';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "Armazena informações de conexão com a base de dados.";
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Databases';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "Databases";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "BDD";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "Base de Dados";
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'ebbd754d-ca74-d5b1-a77e-9206ba3ecc3f';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/databases/databases.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "ebbd754d-ca74-d5b1-a77e-9206ba3ecc3f";
+		$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/databases/databases.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'database_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "database_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "ebbd754d-ca74-d5b1-a77e-9206ba3ecc3f";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "database_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "database_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'database_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "database_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_databases';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'database_connection_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT PRIMARY KEY';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_databases";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "database_connection_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT PRIMARY KEY";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'database_connection_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "database_connection_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_driver';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_type';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the database driver.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_driver";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_type";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the database driver.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_type';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_type';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the database type.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_type";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_type";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the database type.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_host';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_host';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the host name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_host";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_host";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the host name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_port';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_port';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the port number.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_port";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_port";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the port number.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the database name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_name";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the database name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_username';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_username';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the database username.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_username";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_username";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the database username.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_password';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_password';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the database password.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_password";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_password";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the database password.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_path';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_path';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the database file path.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_path";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_path";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the database file path.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'database_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'db_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "database_description";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "db_description";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
 		$z++;
-?>
+?>
\ No newline at end of file
diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php
index 5f175c20c2..a169ea35cf 100644
--- a/core/default_settings/app_config.php
+++ b/core/default_settings/app_config.php
@@ -1,86 +1,87 @@
 <?php
 	//application details
-		$apps[$x]['name'] = 'Default Settings';
-		$apps[$x]['uuid'] = '2c2453c0-1bea-4475-9f44-4d969650de09';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = 'Default settings that apply to all domains.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['name'] = "Default Settings";
+		$apps[$x]['uuid'] = "2c2453c0-1bea-4475-9f44-4d969650de09";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "Default settings that apply to all domains.";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Configurations par défaut applicable à tous les domaines";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Configurações padrão que se aplicam a todos os domínios.';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "Configurações padrão que se aplicam a todos os domínios.";
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Default Settings';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "Default Settings";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Confs par Défaut";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][0]['title']['pt-pt'] = 'Predefinições';
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '834b2739-9e99-4345-9b0b-7ec3ca332b67';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/default_settings/default_settings.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][0]['title']['pt-pt'] = "Predefinições";
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "834b2739-9e99-4345-9b0b-7ec3ca332b67";
+		$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/default_settings/default_settings.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'default_setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "default_setting_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "834b2739-9e99-4345-9b0b-7ec3ca332b67";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'default_setting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "default_setting_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'default_setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "default_setting_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'default_setting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "default_setting_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_default_settings';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$apps[$x]['db'][$y]['table'] = "v_default_settings";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_category";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_subcategory';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the subcategory.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_subcategory";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the subcategory.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_value';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_value";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the value.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'default_setting_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "default_setting_description";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+?>
\ No newline at end of file
diff --git a/core/domain_settings/app_config.php b/core/domain_settings/app_config.php
index 8c9dfc6d3e..e2ffd3d7cc 100644
--- a/core/domain_settings/app_config.php
+++ b/core/domain_settings/app_config.php
@@ -1,137 +1,139 @@
 <?php
 	//application details
-		$apps[$x]['name'] = 'Domains';
-		$apps[$x]['guid'] = 'b31e723a-bf70-670c-a49b-470d2a232f71';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = 'Manage a single domain or multiple domains for multi-tenant.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['name'] = "Domains";
+		$apps[$x]['guid'] = "b31e723a-bf70-670c-a49b-470d2a232f71";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "Manage a single domain or multiple domains for multi-tenant.";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Gestion d'un domaine ou plusieurs dans le cas d'un système multi-parties.";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Gerir um único domínio ou vários domínios para multi-tenant.';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "Gerir um único domínio ou vários domínios para multi-tenant.";
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Domains';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "Domains";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "domaines";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "Dominios";
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '4fa7e90b-6d6c-12d4-712f-62857402b801';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/domain_settings/domains.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "4fa7e90b-6d6c-12d4-712f-62857402b801";
+		$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/domain_settings/domains.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "4fa7e90b-6d6c-12d4-712f-62857402b801";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_select';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_select";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
-		$apps[$x]['permissions'][$y]['name'] = 'domain_setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_setting_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "4fa7e90b-6d6c-12d4-712f-62857402b801";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_setting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_setting_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_setting_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'domain_setting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "domain_setting_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the domain name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the domain name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_description";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
 
 		$y = 1; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_domain_settings';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_domain_settings";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_category";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_subcategory';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the subcategory.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_subcategory";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the subcategory.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_value';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_value";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the value.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_setting_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_setting_description";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+?>
\ No newline at end of file
diff --git a/core/menu/app_config.php b/core/menu/app_config.php
index d5f6e38806..60429e5b92 100644
--- a/core/menu/app_config.php
+++ b/core/menu/app_config.php
@@ -1,363 +1,363 @@
 <?php
 	//application details
 		$apps[$x]['name'] = "Menu Manager";
-		$apps[$x]['uuid'] = 'f4b3b3d2-6287-489c-2a00-64529e46f2d7';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = 'The menu can be customized using this tool.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['uuid'] = "f4b3b3d2-6287-489c-2a00-64529e46f2d7";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "The menu can be customized using this tool.";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Le menu peut être personnalisé ici";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "O menu pode ser personalizado usando esta ferramenta.";
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
 		$apps[$x]['menu'][0]['title']['en-us'] = "Menu Manager";
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Gestion des Menus";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "Gestor de Menus";
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = 'da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e';
-		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/menu/menu.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "da3a9ab4-c28e-ea8d-50cc-e8405ac8e76e";
+		$apps[$x]['menu'][0]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/menu/menu.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
-		$apps[$x]['menu'][1]['title']['en-us'] = 'System';
-		$apps[$x]['menu'][1]['title']['es-mx'] = '';
-		$apps[$x]['menu'][1]['title']['de-de'] = '';
-		$apps[$x]['menu'][1]['title']['de-ch'] = '';
-		$apps[$x]['menu'][1]['title']['de-at'] = '';
-		$apps[$x]['menu'][1]['title']['fr-fr'] = 'Système';
-		$apps[$x]['menu'][1]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][1]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][1]['title']['pt-pt'] = 'Sistema';
-		$apps[$x]['menu'][1]['title']['pt-br'] = '';
-		$apps[$x]['menu'][1]['uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
-		$apps[$x]['menu'][1]['parent_uuid'] = '';
-		$apps[$x]['menu'][1]['category'] = 'internal';
-		$apps[$x]['menu'][1]['path'] = '/core/user_settings/user_dashboard.php';
-		$apps[$x]['menu'][1]['order'] = '5';
-		$apps[$x]['menu'][1]['groups'][] = 'user';
-		$apps[$x]['menu'][1]['groups'][] = 'admin';
-		$apps[$x]['menu'][1]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][1]['title']['en-us'] = "System";
+		$apps[$x]['menu'][1]['title']['es-mx'] = "";
+		$apps[$x]['menu'][1]['title']['de-de'] = "";
+		$apps[$x]['menu'][1]['title']['de-ch'] = "";
+		$apps[$x]['menu'][1]['title']['de-at'] = "";
+		$apps[$x]['menu'][1]['title']['fr-fr'] = "Système";
+		$apps[$x]['menu'][1]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][1]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][1]['title']['pt-pt'] = "Sistema";
+		$apps[$x]['menu'][1]['title']['pt-br'] = "";
+		$apps[$x]['menu'][1]['uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
+		$apps[$x]['menu'][1]['parent_uuid'] = "";
+		$apps[$x]['menu'][1]['category'] = "internal";
+		$apps[$x]['menu'][1]['path'] = "/core/user_settings/user_dashboard.php";
+		$apps[$x]['menu'][1]['order'] = "5";
+		$apps[$x]['menu'][1]['groups'][] = "user";
+		$apps[$x]['menu'][1]['groups'][] = "admin";
+		$apps[$x]['menu'][1]['groups'][] = "superadmin";
 
-		$apps[$x]['menu'][2]['title']['en-us'] = 'Accounts';
-		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de-de'] = '';
-		$apps[$x]['menu'][2]['title']['de-ch'] = '';
-		$apps[$x]['menu'][2]['title']['de-at'] = '';
-		$apps[$x]['menu'][2]['title']['fr-fr'] = 'Comptes';
-		$apps[$x]['menu'][2]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][2]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][2]['title']['pt-pt'] = 'Contas';
-		$apps[$x]['menu'][2]['title']['pt-br'] = '';
-		$apps[$x]['menu'][2]['uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
-		$apps[$x]['menu'][2]['parent_uuid'] = '';
-		$apps[$x]['menu'][2]['category'] = 'internal';
-		$apps[$x]['menu'][2]['path'] = '/core/users/index.php';
-		$apps[$x]['menu'][2]['order'] = '10';
-		$apps[$x]['menu'][2]['groups'][] = 'admin';
-		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][2]['title']['en-us'] = "Accounts";
+		$apps[$x]['menu'][2]['title']['es-mx'] = "";
+		$apps[$x]['menu'][2]['title']['de-de'] = "";
+		$apps[$x]['menu'][2]['title']['de-ch'] = "";
+		$apps[$x]['menu'][2]['title']['de-at'] = "";
+		$apps[$x]['menu'][2]['title']['fr-fr'] = "Comptes";
+		$apps[$x]['menu'][2]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][2]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][2]['title']['pt-pt'] = "Contas";
+		$apps[$x]['menu'][2]['title']['pt-br'] = "";
+		$apps[$x]['menu'][2]['uuid'] = "bc96d773-ee57-0cdd-c3ac-2d91aba61b55";
+		$apps[$x]['menu'][2]['parent_uuid'] = "";
+		$apps[$x]['menu'][2]['category'] = "internal";
+		$apps[$x]['menu'][2]['path'] = "/core/users/index.php";
+		$apps[$x]['menu'][2]['order'] = "10";
+		$apps[$x]['menu'][2]['groups'][] = "admin";
+		$apps[$x]['menu'][2]['groups'][] = "superadmin";
 
 		if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/vars/app_config.php")) {
-			$apps[$x]['menu'][3]['title']['en-us'] = 'Dialplan';
-			$apps[$x]['menu'][3]['uuid'] = 'b94e8bd9-9eb5-e427-9c26-ff7a6c21552a';
-			$apps[$x]['menu'][3]['parent_uuid'] = '';
-			$apps[$x]['menu'][3]['category'] = 'internal';
-			$apps[$x]['menu'][3]['path'] = '/app/dialplan/dialplans.php';
-			$apps[$x]['menu'][3]['order'] = '15';
-			$apps[$x]['menu'][3]['groups'][] = 'admin';
-			$apps[$x]['menu'][3]['groups'][] = 'superadmin';
+			$apps[$x]['menu'][3]['title']['en-us'] = "Dialplan";
+			$apps[$x]['menu'][3]['uuid'] = "b94e8bd9-9eb5-e427-9c26-ff7a6c21552a";
+			$apps[$x]['menu'][3]['parent_uuid'] = "";
+			$apps[$x]['menu'][3]['category'] = "internal";
+			$apps[$x]['menu'][3]['path'] = "/app/dialplan/dialplans.php";
+			$apps[$x]['menu'][3]['order'] = "15";
+			$apps[$x]['menu'][3]['groups'][] = "admin";
+			$apps[$x]['menu'][3]['groups'][] = "superadmin";
 		}
 
 		if (file_exists($_SERVER['DOCUMENT_ROOT'].PROJECT_PATH."/app/calls_active/calls_active_extensions.php")) {
-			$apps[$x]['menu'][4]['title']['en-us'] = 'Status';
-			$apps[$x]['menu'][4]['title']['es-mx'] = '';
-			$apps[$x]['menu'][4]['title']['de-de'] = '';
-			$apps[$x]['menu'][4]['title']['de-ch'] = '';
-			$apps[$x]['menu'][4]['title']['de-at'] = '';
-			$apps[$x]['menu'][4]['title']['fr-fr'] = 'Etat';
-			$apps[$x]['menu'][4]['title']['fr-ca'] = '';
-			$apps[$x]['menu'][4]['title']['fr-ch'] = '';
-			$apps[$x]['menu'][4]['title']['pt-pt'] = 'Estado';
-			$apps[$x]['menu'][4]['title']['pt-br'] = '';
-			$apps[$x]['menu'][4]['uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
-			$apps[$x]['menu'][4]['parent_uuid'] = '';
-			$apps[$x]['menu'][4]['category'] = 'internal';
-			$apps[$x]['menu'][4]['path'] = '/app/calls_active/calls_active_extensions.php';
-			$apps[$x]['menu'][4]['order'] = '25';
-			$apps[$x]['menu'][4]['groups'][] = 'user';
-			$apps[$x]['menu'][4]['groups'][] = 'admin';
-			$apps[$x]['menu'][4]['groups'][] = 'superadmin';
+			$apps[$x]['menu'][4]['title']['en-us'] = "Status";
+			$apps[$x]['menu'][4]['title']['es-mx'] = "";
+			$apps[$x]['menu'][4]['title']['de-de'] = "";
+			$apps[$x]['menu'][4]['title']['de-ch'] = "";
+			$apps[$x]['menu'][4]['title']['de-at'] = "";
+			$apps[$x]['menu'][4]['title']['fr-fr'] = "Etat";
+			$apps[$x]['menu'][4]['title']['fr-ca'] = "";
+			$apps[$x]['menu'][4]['title']['fr-ch'] = "";
+			$apps[$x]['menu'][4]['title']['pt-pt'] = "Estado";
+			$apps[$x]['menu'][4]['title']['pt-br'] = "";
+			$apps[$x]['menu'][4]['uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
+			$apps[$x]['menu'][4]['parent_uuid'] = "";
+			$apps[$x]['menu'][4]['category'] = "internal";
+			$apps[$x]['menu'][4]['path'] = "/app/calls_active/calls_active_extensions.php";
+			$apps[$x]['menu'][4]['order'] = "25";
+			$apps[$x]['menu'][4]['groups'][] = "user";
+			$apps[$x]['menu'][4]['groups'][] = "admin";
+			$apps[$x]['menu'][4]['groups'][] = "superadmin";
 		}
 
-		$apps[$x]['menu'][5]['title']['en-us'] = 'Advanced';
-		$apps[$x]['menu'][5]['title']['es-mx'] = '';
-		$apps[$x]['menu'][5]['title']['de-de'] = '';
-		$apps[$x]['menu'][5]['title']['de-ch'] = '';
-		$apps[$x]['menu'][5]['title']['de-at'] = '';
-		$apps[$x]['menu'][5]['title']['fr-fr'] = 'Avancé';
-		$apps[$x]['menu'][5]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][5]['title']['fr-ch'] = '';
-		$apps[$x]['menu'][5]['title']['pt-pt'] = 'Avançado';
-		$apps[$x]['menu'][5]['title']['pt-br'] = '';
-		$apps[$x]['menu'][5]['uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][5]['parent_uuid'] = '';
-		$apps[$x]['menu'][5]['category'] = 'internal';
-		$apps[$x]['menu'][5]['path'] = '/core/domain_settings/domains.php';
-		$apps[$x]['menu'][5]['order'] = '30';
-		$apps[$x]['menu'][5]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][5]['title']['en-us'] = "Advanced";
+		$apps[$x]['menu'][5]['title']['es-mx'] = "";
+		$apps[$x]['menu'][5]['title']['de-de'] = "";
+		$apps[$x]['menu'][5]['title']['de-ch'] = "";
+		$apps[$x]['menu'][5]['title']['de-at'] = "";
+		$apps[$x]['menu'][5]['title']['fr-fr'] = "Avancé";
+		$apps[$x]['menu'][5]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][5]['title']['fr-ch'] = "";
+		$apps[$x]['menu'][5]['title']['pt-pt'] = "Avançado";
+		$apps[$x]['menu'][5]['title']['pt-br'] = "";
+		$apps[$x]['menu'][5]['uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][5]['parent_uuid'] = "";
+		$apps[$x]['menu'][5]['category'] = "internal";
+		$apps[$x]['menu'][5]['path'] = "/core/domain_settings/domains.php";
+		$apps[$x]['menu'][5]['order'] = "30";
+		$apps[$x]['menu'][5]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_restore';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_restore";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_group_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_group_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_group_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_item_group_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_item_group_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_language_view";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_language_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_language_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'menu_language_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "menu_language_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_menus";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name of the menu.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name of the menu.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the language.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_language";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the language.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_desc';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the description.';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_description";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_desc";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
 		$z++;
 
 		$y = 1; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_menu_items";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_menus";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_parent_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_parent_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_parent_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_parent_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_title';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_title";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_link';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_str';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_link";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_str";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_category";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_protected';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_protected";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_order';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_order";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_desc';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_description";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_desc";
 		
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_add_user";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_add_date";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_mod_user';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_mod_user";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_mod_date';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_mod_date";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 2; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_item_groups';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_menu_item_groups";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_group_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_menus";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_menu_items";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "menu_item_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 3; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_menu_languages';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_language_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['table'] = "v_menu_languages";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_language_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_menus';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_menus";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "menu_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'menu_item_guid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_menu_items';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'menu_item_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_guid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_menu_items";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "menu_item_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_language';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_language";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'menu_item_title';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "menu_item_title";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 ?>
diff --git a/core/upgrade/app_config.php b/core/upgrade/app_config.php
index 77b7e4119e..deceaf1d43 100644
--- a/core/upgrade/app_config.php
+++ b/core/upgrade/app_config.php
@@ -1,89 +1,90 @@
 <?php
 	//application details
 		$apps[$x]['name'] = "Upgrade Schema";
-		$apps[$x]['uuid'] = '8b1d7eb5-1009-052c-e1a8-d1f4887a3f5c';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = 'Upgrade the database schema.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['uuid'] = "8b1d7eb5-1009-052c-e1a8-d1f4887a3f5c";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "Upgrade the database schema.";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Mise à jour du Schéma de la base de données";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
 		$apps[$x]['description']['pt-pt'] = "Atualizar o esquema de base de dados.";
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Upgrade Schema';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "Upgrade Schema";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "MàJ BDD";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "Actualizar BD";
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '8c826e92-be3c-0944-669a-24e5b915d562';
-		$apps[$x]['menu'][0]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/upgrade/upgrade_schema.php';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "8c826e92-be3c-0944-669a-24e5b915d562";
+		$apps[$x]['menu'][0]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/upgrade/upgrade_schema.php";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'upgrade_schema';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = "upgrade_schema";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "8c826e92-be3c-0944-669a-24e5b915d562";
+		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
-		$apps[$x]['permissions'][1]['name'] = 'upgrade_svn';
+		$apps[$x]['permissions'][1]['name'] = "upgrade_svn";
 
 	//schema details
 		/*
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_src';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'src_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_src";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "src_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'src_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "src_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'type';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "type";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'last_mod';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "last_mod";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'path';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "path";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		*/
-?>
+?>
\ No newline at end of file
diff --git a/core/user_settings/app_config.php b/core/user_settings/app_config.php
index 52499058bc..ee92a3a9d1 100644
--- a/core/user_settings/app_config.php
+++ b/core/user_settings/app_config.php
@@ -1,51 +1,52 @@
 <?php
 	//application details
 		$apps[$x]['name'] = "Account Settings";
-		$apps[$x]['uuid'] = '3a3337f7-78d1-23e3-0cfd-f14499b8ed97';
-		$apps[$x]['category'] = 'Switch';;
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['uuid'] = "3a3337f7-78d1-23e3-0cfd-f14499b8ed97";
+		$apps[$x]['category'] = "Switch";;
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "User account settings can be changed by the user.";
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "L'usager peut modifier la configuration de son compte";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Configurações de conta de utilizador pode ser alterado pelo utilizador.';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "Configurações de conta de utilizador pode ser alterado pelo utilizador.";
+		$apps[$x]['description']['pt-br'] = "";
 
 	//menu details
-		$apps[$x]['menu'][0]['title']['en-us'] = 'Account Settings';
-		$apps[$x]['menu'][0]['title']['es-mx'] = '';
-		$apps[$x]['menu'][0]['title']['de-de'] = '';
-		$apps[$x]['menu'][0]['title']['de-ch'] = '';
-		$apps[$x]['menu'][0]['title']['de-at'] = '';
+		$apps[$x]['menu'][0]['title']['en-us'] = "Account Settings";
+		$apps[$x]['menu'][0]['title']['es-mx'] = "";
+		$apps[$x]['menu'][0]['title']['de-de'] = "";
+		$apps[$x]['menu'][0]['title']['de-ch'] = "";
+		$apps[$x]['menu'][0]['title']['de-at'] = "";
 		$apps[$x]['menu'][0]['title']['fr-fr'] = "Confs du Compte";
-		$apps[$x]['menu'][0]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][0]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][0]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][0]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][0]['title']['pt-pt'] = "Configurações da Conta";
-		$apps[$x]['menu'][0]['title']['pt-br'] = '';
-		$apps[$x]['menu'][0]['uuid'] = '4d532f0b-c206-c39d-ff33-fc67d668fb69';
-		$apps[$x]['menu'][0]['parent_uuid'] = '02194288-6d56-6d3e-0b1a-d53a2bc10788';
-		$apps[$x]['menu'][0]['category'] = 'internal';
-		$apps[$x]['menu'][0]['path'] = '/core/user_settings/user_edit.php';
-		$apps[$x]['menu'][0]['groups'][] = 'user';
-		$apps[$x]['menu'][0]['groups'][] = 'admin';
-		$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][0]['title']['pt-br'] = "";
+		$apps[$x]['menu'][0]['uuid'] = "4d532f0b-c206-c39d-ff33-fc67d668fb69";
+		$apps[$x]['menu'][0]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
+		$apps[$x]['menu'][0]['category'] = "internal";
+		$apps[$x]['menu'][0]['path'] = "/core/user_settings/user_edit.php";
+		$apps[$x]['menu'][0]['groups'][] = "user";
+		$apps[$x]['menu'][0]['groups'][] = "admin";
+		$apps[$x]['menu'][0]['groups'][] = "superadmin";
 
 	//permission details
-		$apps[$x]['permissions'][0]['name'] = 'user_account_setting_view';
-		$apps[$x]['permissions'][0]['groups'][] = 'user';
-		$apps[$x]['permissions'][0]['groups'][] = 'admin';
-		$apps[$x]['permissions'][0]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][0]['name'] = "user_account_setting_view";
+		$apps[$x]['permissions'][0]['menu']['uuid'] = "4d532f0b-c206-c39d-ff33-fc67d668fb69";
+		$apps[$x]['permissions'][0]['groups'][] = "user";
+		$apps[$x]['permissions'][0]['groups'][] = "admin";
+		$apps[$x]['permissions'][0]['groups'][] = "superadmin";
 
-		$apps[$x]['permissions'][1]['name'] = 'user_account_setting_edit';
-		$apps[$x]['permissions'][1]['groups'][] = 'user';
-		$apps[$x]['permissions'][1]['groups'][] = 'admin';
-		$apps[$x]['permissions'][1]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][1]['name'] = "user_account_setting_edit";
+		$apps[$x]['permissions'][1]['groups'][] = "user";
+		$apps[$x]['permissions'][1]['groups'][] = "admin";
+		$apps[$x]['permissions'][1]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/core/users/app_config.php b/core/users/app_config.php
index ca72556fd6..cc0e1f4dca 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -1,439 +1,444 @@
 <?php
 	//application details
 		$apps[$x]['name'] = "User Manager";
-		$apps[$x]['uuid'] = '112124b3-95c2-5352-7e9d-d14c0b88f207';
-		$apps[$x]['category'] = 'Core';
-		$apps[$x]['subcategory'] = '';
-		$apps[$x]['version'] = '';
-		$apps[$x]['license'] = 'Mozilla Public License 1.1';
-		$apps[$x]['url'] = 'http://www.fusionpbx.com';
-		$apps[$x]['description']['en-us'] = 'Add, edit, delete, and search for users.';
-		$apps[$x]['description']['es-mx'] = '';
-		$apps[$x]['description']['de-de'] = '';
-		$apps[$x]['description']['de-ch'] = '';
-		$apps[$x]['description']['de-at'] = '';
+		$apps[$x]['uuid'] = "112124b3-95c2-5352-7e9d-d14c0b88f207";
+		$apps[$x]['category'] = "Core";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "";
+		$apps[$x]['license'] = "Mozilla Public License 1.1";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "Add, edit, delete, and search for users.";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-at'] = "";
 		$apps[$x]['description']['fr-fr'] = "Ajouter, Editer, Supprimer et Chercher des Usagers";
-		$apps[$x]['description']['fr-ca'] = '';
-		$apps[$x]['description']['fr-ch'] = '';
-		$apps[$x]['description']['pt-pt'] = 'Adicionar, editar, apagar e pesquisa pelos utilizadores.';
-		$apps[$x]['description']['pt-br'] = '';
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ch'] = "";
+		$apps[$x]['description']['pt-pt'] = "Adicionar, editar, apagar e pesquisa pelos utilizadores.";
+		$apps[$x]['description']['pt-br'] = "";
 
 		$apps[$x]['menu'][2]['title']['en-us'] = "User Manager";
-		$apps[$x]['menu'][2]['title']['es-mx'] = '';
-		$apps[$x]['menu'][2]['title']['de-de'] = '';
-		$apps[$x]['menu'][2]['title']['de-ch'] = '';
-		$apps[$x]['menu'][2]['title']['de-at'] = '';
+		$apps[$x]['menu'][2]['title']['es-mx'] = "";
+		$apps[$x]['menu'][2]['title']['de-de'] = "";
+		$apps[$x]['menu'][2]['title']['de-ch'] = "";
+		$apps[$x]['menu'][2]['title']['de-at'] = "";
 		$apps[$x]['menu'][2]['title']['fr-fr'] = "Gestion Usagers";
-		$apps[$x]['menu'][2]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][2]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][2]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][2]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][2]['title']['pt-pt'] = "Gestor de Utilizadores";
-		$apps[$x]['menu'][2]['title']['pt-br'] = '';
-		$apps[$x]['menu'][2]['uuid'] = '0d57cc1e-1874-47b9-7ddd-fe1f57cec99b';
-		$apps[$x]['menu'][2]['parent_uuid'] = 'bc96d773-ee57-0cdd-c3ac-2d91aba61b55';
-		$apps[$x]['menu'][2]['category'] = 'internal';
-		$apps[$x]['menu'][2]['path'] = '/core/users/index.php';
-		$apps[$x]['menu'][2]['groups'][] = 'admin';
-		$apps[$x]['menu'][2]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][2]['title']['pt-br'] = "";
+		$apps[$x]['menu'][2]['uuid'] = "0d57cc1e-1874-47b9-7ddd-fe1f57cec99b";
+		$apps[$x]['menu'][2]['parent_uuid'] = "bc96d773-ee57-0cdd-c3ac-2d91aba61b55";
+		$apps[$x]['menu'][2]['category'] = "internal";
+		$apps[$x]['menu'][2]['path'] = "/core/users/index.php";
+		$apps[$x]['menu'][2]['groups'][] = "admin";
+		$apps[$x]['menu'][2]['groups'][] = "superadmin";
 
 		$apps[$x]['menu'][3]['title']['en-us'] = "Group Manager";
-		$apps[$x]['menu'][3]['title']['es-mx'] = '';
-		$apps[$x]['menu'][3]['title']['de-de'] = '';
-		$apps[$x]['menu'][3]['title']['de-ch'] = '';
-		$apps[$x]['menu'][3]['title']['de-at'] = '';
+		$apps[$x]['menu'][3]['title']['es-mx'] = "";
+		$apps[$x]['menu'][3]['title']['de-de'] = "";
+		$apps[$x]['menu'][3]['title']['de-ch'] = "";
+		$apps[$x]['menu'][3]['title']['de-at'] = "";
 		$apps[$x]['menu'][3]['title']['fr-fr'] = "Gestion Groupes";
-		$apps[$x]['menu'][3]['title']['fr-ca'] = '';
-		$apps[$x]['menu'][3]['title']['fr-ch'] = '';
+		$apps[$x]['menu'][3]['title']['fr-ca'] = "";
+		$apps[$x]['menu'][3]['title']['fr-ch'] = "";
 		$apps[$x]['menu'][3]['title']['pt-pt'] ="'Gestor de Grupos";
-		$apps[$x]['menu'][3]['title']['pt-br'] = '';
-		$apps[$x]['menu'][3]['uuid'] = '3b4acc6d-827b-f537-bf21-0093d94ffec7';
-		$apps[$x]['menu'][3]['parent_uuid'] = '594d99c5-6128-9c88-ca35-4b33392cec0f';
-		$apps[$x]['menu'][3]['category'] = 'internal';
-		$apps[$x]['menu'][3]['path'] = '/core/users/groups.php';
-		$apps[$x]['menu'][3]['groups'][] = 'superadmin';
+		$apps[$x]['menu'][3]['title']['pt-br'] = "";
+		$apps[$x]['menu'][3]['uuid'] = "3b4acc6d-827b-f537-bf21-0093d94ffec7";
+		$apps[$x]['menu'][3]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
+		$apps[$x]['menu'][3]['category'] = "internal";
+		$apps[$x]['menu'][3]['path'] = "/core/users/groups.php";
+		$apps[$x]['menu'][3]['groups'][] = "superadmin";
 
 	//permission details
 		$y = 0;
-		$apps[$x]['permissions'][$y]['name'] = 'user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "user_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "0d57cc1e-1874-47b9-7ddd-fe1f57cec99b";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "user_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "user_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "user_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "3b4acc6d-827b-f537-bf21-0093d94ffec7";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_member_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "3b4acc6d-827b-f537-bf21-0093d94ffec7";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_member_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_member_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_member_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permissions';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_permissions";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['name'] = "group_user_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "3b4acc6d-827b-f537-bf21-0093d94ffec7";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['name'] = "group_user_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['name'] = "group_user_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_user_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['name'] = "group_user_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_permission_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "3b4acc6d-827b-f537-bf21-0093d94ffec7";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_permission_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_permission_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'group_permission_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['name'] = "group_permission_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_view';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$apps[$x]['permissions'][$y]['name'] = "user_setting_view";
+		$apps[$x]['permissions'][$y]['menu']['uuid'] = "0d57cc1e-1874-47b9-7ddd-fe1f57cec99b";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_add';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$apps[$x]['permissions'][$y]['name'] = "user_setting_add";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_edit';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
+		$apps[$x]['permissions'][$y]['name'] = "user_setting_edit";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = 'user_setting_delete';
-		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
-		$apps[$x]['permissions'][$y]['groups'][] = 'user';
-
+		$apps[$x]['permissions'][$y]['name'] = "user_setting_delete";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
 	//schema details
 		$y = 0; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_users';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['table'] = "v_users";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'username';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "username";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'password';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "password";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'salt';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "salt";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_contacts';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'contact_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "contact_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_contacts";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "contact_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_email';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'useremail';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "user_email";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "useremail";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_status';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'userstatus';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "user_status";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "userstatus";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'user_time_zone';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'usertimezone';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "user_time_zone";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "usertimezone";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'api_key';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "api_key";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_user';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradduser';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "add_user";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = "user_add_user";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = "useradduser";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'user_add_date';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = 'useradddate';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "add_date";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = "user_add_date";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'][] = "useradddate";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 1; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_groups';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['table'] = "v_groups";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "group_name";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "groupid";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_protected';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_protected";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'group_description';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupdesc';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "group_description";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "groupdesc";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 2; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_group_users';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['table'] = "v_group_users";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_user_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'groupid';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "group_name";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "groupid";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		//$z++;
-		//$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_uuid';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		//$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_uuid";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'username';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "username";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 3; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_group_permissions';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_permission_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['table'] = "v_group_permissions";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_permission_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'id';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'group_permission_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'serial';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'integer';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'INT NOT NULL AUTO_INCREMENT';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "id";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "group_permission_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "serial";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "integer";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "INT NOT NULL AUTO_INCREMENT";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'v_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "v_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'permission_name';
-		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'permission_id';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "permission_name";
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "permission_id";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		//$apps[$x]['db'][$y]['fields'][$z]['name'] = 'group_uuid';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
-		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		//$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_uuid";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		//$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		//$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
+		//$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y = 4; //table array index
 		$z = 0; //field array index
-		$apps[$x]['db'][$y]['table'] = 'v_user_settings';
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$apps[$x]['db'][$y]['table'] = "v_user_settings";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_domains";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "domain_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_category';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the category.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_category";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the category.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_subcategory';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the subcategory.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_subcategory";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the subcategory.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_name';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the name.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_value';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the value.';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_value";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the value.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_enabled';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_setting_description';
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
-?>
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "user_setting_description";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+?>
\ No newline at end of file