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/application/forms/helpers/CustomDecorators.php

@@ -0,0 +1,14 @@
+<?php
+
+class Airtime_Decorator_SuperAdmin_Only extends Zend_Form_Decorator_Abstract
+{
+    public function render($content)
+    {
+        $currentUser = Application_Model_User::getCurrentUser();
+        if (!$currentUser->isSuperAdmin()) {
+            return $content;
+        } else {
+            return "";
+        }
+    }
+}