Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations

Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js

airtime_mvc/application/forms/BillingClient.php

@@ -188,6 +188,10 @@ class Application_Form_BillingClient extends Zend_Form
         $passwordVerify->addValidator($notEmptyValidator);
         $this->addElement($passwordVerify);
 
+        $this->addElement('hash', 'csrf', array(
+            'salt' => 'unique'
+        ));
+
         $submit = new Zend_Form_Element_Submit("submit");
         $submit->setIgnore(true)
                 ->setLabel(_pro("Save"));

airtime_mvc/application/forms/BillingUpgradeDowngrade.php

@@ -8,6 +8,10 @@ class Application_Form_BillingUpgradeDowngrade extends Zend_Form
         $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
         $this->addElement($csrf_element);
 
+        $this->addElement('hash', 'csrf', array(
+            'salt' => 'unique'
+        ));
+
         $productPrices = array();
         $productTypes = array();       
         list($productPrices, $productTypes) = Billing::getProductPricesAndTypes();