Merge branch '2.5.x' into saas

Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml

airtime_mvc/public/js/airtime/preferences/preferences.js

@@ -97,32 +97,6 @@ function setCollapsibleWidgetJsCode() {
     $('#thirdPartyApi-element input').click(x);
 }
 
-function createWidgetHelpDescription() {
-    $('#thirdPartyApiInfo').qtip({
-        content: {
-            text: "Enabling this feature will allow Airtime to " +
-            "provide schedule data to external widgets that can be embedded " +
-            "in your website. Enable this feature to reveal the embeddable " +
-            "code."
-        },
-        hide: {
-            delay: 500,
-            fixed: true
-        },
-        style: {
-            border: {
-                width: 0,
-                radius: 4
-            },
-            classes: "ui-tooltip-dark ui-tooltip-rounded"
-        },
-        position: {
-            my: "left bottom",
-            at: "right center"
-        },
-    });
-}
-
 function setSoundCloudCheckBoxListener() {
     var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption");
     var mainCheckBox= $("#UploadToSoundcloudOption");
@@ -169,5 +143,4 @@ $(document).ready(function() {
     setConfigureMailServerListener();
     setEnableSystemEmailsListener();
     setCollapsibleWidgetJsCode();
-    createWidgetHelpDescription();
 });