diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index ad313bc68d..db8e56fb92 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -755,4 +755,5 @@ else {
 
 //include the footer
 	require_once "resources/footer.php";
-?>
+
+?>
\ No newline at end of file
diff --git a/app/dialplan/app_languages.php b/app/dialplan/app_languages.php
index 9ddd161baf..268f332d55 100644
--- a/app/dialplan/app_languages.php
+++ b/app/dialplan/app_languages.php
@@ -118,6 +118,16 @@ $text['option-company_directory']['sv-se'] = "Företagskatalog";
 $text['option-company_directory']['uk'] = "Каталог компаній";
 $text['option-company_directory']['de-at'] = "Firmenverzeichnis";
 
+$text['option-hangup']['en-us'] = "Hangup";
+$text['option-hangup']['es-cl'] = "Colgar";
+$text['option-hangup']['pt-pt'] = "Desligar";
+$text['option-hangup']['fr-fr'] = "Raccrocher";
+$text['option-hangup']['pt-br'] = "Desligar";
+$text['option-hangup']['pl'] = "Odwieszenie";
+$text['option-hangup']['sv-se'] = "Lägg på";
+$text['option-hangup']['uk'] = "роз'єднання";
+$text['option-hangup']['de-at'] = "Auflegen";
+
 $text['option-record']['en-us'] = "Record";
 $text['option-record']['es-cl'] = "Registro";
 $text['option-record']['pt-pt'] = "Registro";
diff --git a/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml b/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml
index e0e54da53f..3ea14028df 100644
--- a/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml
+++ b/app/dialplan/resources/switch/conf/dialplan/980_cidlookup.xml
@@ -1,7 +1,7 @@
 <context name="{v_context}">
 	<extension name="cidlookup" number="" continue="true" app_uuid="a0cb498c-6e09-441f-83ea-a7684565c44e" enabled="false">
 		<condition field="${user_exists}" expression="^true$"/>
-		<condition field="${call_direction}" expression="^(inbound)$" break="never">
+		<condition field="${call_direction}" expression="^inbound$">
 			<action application="set" data="effective_caller_id_name=${cidlookup(${caller_id_number})}"/>
 		</condition>
 	</extension>
diff --git a/resources/classes/destinations.php b/resources/classes/destinations.php
index ddb95690d2..cff34ae040 100644
--- a/resources/classes/destinations.php
+++ b/resources/classes/destinations.php
@@ -97,6 +97,11 @@ class destinations {
 			$this->destinations[$x]['result']['data'][$y]['name'] = '*411';
 			$this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}';
 			$y++;
+			$this->destinations[$x]['result']['data'][$y]['label'] = 'hangup';
+			$this->destinations[$x]['result']['data'][$y]['name'] = 'hangup';
+			$this->destinations[$x]['result']['data'][$y]['application'] = 'hangup';
+			$this->destinations[$x]['result']['data'][$y]['destination'] = '';
+			$y++;
 			$this->destinations[$x]['result']['data'][$y]['label'] = 'record';
 			$this->destinations[$x]['result']['data'][$y]['name'] = '*732';
 			$this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}';
@@ -211,7 +216,7 @@ class destinations {
 											}
 											else {
 												$label = $data['label'];
-												$select_label = str_replace("\${".$key."}", $text2['option-'.$label]."215", $select_label);
+												$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
 											}
 										}
 									}
@@ -227,8 +232,13 @@ class destinations {
 										$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
 									}
 								}
+								//application: hangup
+								if (strlen($data['application']) > 0) {
+									$select_value = str_replace("transfer", $data['application'], $select_value);
+								}
 							}
 						}
+
 						$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value);
 						$select_value = str_replace("\${context}", $_SESSION['context'], $select_value); //to do: context can come from the array
 						$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label);
diff --git a/resources/install/scripts/fax_queue_monitor.lua b/resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua
similarity index 100%
rename from resources/install/scripts/fax_queue_monitor.lua
rename to resources/install/scripts/app/fax/resources/scripts/fax_queue_monitor.lua
diff --git a/resources/install/scripts/fax_queue_poll_once.lua b/resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua
similarity index 100%
rename from resources/install/scripts/fax_queue_poll_once.lua
rename to resources/install/scripts/app/fax/resources/scripts/fax_queue_poll_once.lua
diff --git a/resources/install/scripts/do_not_disturb.lua b/resources/install/scripts/do_not_disturb.lua
index 085ecedb68..9cf853de80 100644
--- a/resources/install/scripts/do_not_disturb.lua
+++ b/resources/install/scripts/do_not_disturb.lua
@@ -175,8 +175,10 @@
 
 		--clear the cache
 			if (extension ~= nil) then
+				freeswitch.consoleLog("notice", "[do_not_disturb] memcache delete directory:"..extension.."@"..domain_name);
 				api:execute("memcache", "delete directory:"..extension.."@"..domain_name);
 				if #number_alias > 0 then
+					freeswitch.consoleLog("notice", "[do_not_disturb] memcache delete directory:"..number_alias.."@"..domain_name);
 					api:execute("memcache", "delete directory:"..number_alias.."@"..domain_name);
 				end
 			end
diff --git a/resources/switch.php b/resources/switch.php
index bf96fa85a3..c073d23a7c 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -1513,4 +1513,4 @@ if(!function_exists('find_php_by_extension')) {
 	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/resources/templates/conf/freeswitch.xml b/resources/templates/conf/freeswitch.xml
index 7a1b1d3d15..e25bbc3f70 100644
--- a/resources/templates/conf/freeswitch.xml
+++ b/resources/templates/conf/freeswitch.xml
@@ -51,17 +51,17 @@
   </section>
 
   <!-- mod_dingaling is reliant on the vcard data in the "directory" section. -->
-  <!-- mod_sofia is reliant on the user data for authorization --> 
+  <!-- mod_sofia is reliant on the user data for authorization -->
   <section name="directory" description="User Directory">
     <X-PRE-PROCESS cmd="include" data="directory/*.xml"/>
   </section>
 
-  <!-- languages section (under development still) -->
+  <!-- languages section -->
   <section name="languages" description="Language Management">
-    <X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>
+    <!--<X-PRE-PROCESS cmd="include" data="lang/de/*.xml"/>-->
     <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>
-    <X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>
+    <!--<X-PRE-PROCESS cmd="include" data="lang/fr/*.xml"/>-->
+    <!--<X-PRE-PROCESS cmd="include" data="lang/ru/*.xml"/>-->
+    <!--<X-PRE-PROCESS cmd="include" data="lang/he/*.xml"/>-->
   </section>
 </document>
diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
index b081d013c3..354f07ba0b 100644
--- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
@@ -31,7 +31,7 @@
 	<remote_reboot>1</remote_reboot>
 	<checkpeercert>0</checkpeercert>
 	<sipkeepalive>1</sipkeepalive>
-	<rss_feed>http://rss.news.yahoo.com/rss/topstories</rss_feed>
+	<rss_feed></rss_feed>
 	<host_ip>135.199.77.12</host_ip>
 	<video_ip>135.199.77.12</video_ip>
 	<sntp>128.138.141.172</sntp>
@@ -135,7 +135,7 @@
 	<dseday>1</dseday>
 	<ds_transition_time>2</ds_transition_time>
 	<flashVer>201</flashVer>
-	<http_download>sipdnld.mitel.com</http_download>
+	<http_download>${domain_name}/app/provision</http_download>
 	<tftp>sipdnld.mitel.com</tftp>
 	<downloadtype>1</downloadtype>
 	<dialpl></dialpl>
@@ -283,11 +283,11 @@
 		<Key Line="38" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="39" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="40" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="41" Fea="19" Des="Weather" Addr="http://weather.yahooapis.com/forecastrss?p=CAXX0343" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
+		<!--<Key Line="41" Fea="19" Des="Weather" Addr="http://weather.yahooapis.com/forecastrss?p=CAXX0343" Addr2="" Mode="1" Mode2="1" UserID=""></Key>-->
 		<Key Line="42" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="43" Fea="4" Des="Headset				 " Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
+		<Key Line="43" Fea="4" Des="Headset" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="44" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="45" Fea="3" Des="Advisory				" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
+		<Key Line="45" Fea="3" Des="Advisory" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="46" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="47" Fea="2" Des="Call logs" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
 		<Key Line="48" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>