Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

airtime_mvc/application/views/scripts/form/edit-user.phtml

@@ -166,6 +166,7 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+        <?php echo $this->element->getElement('csrf') ?>
     </dl>
     <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
 </form>

airtime_mvc/application/views/scripts/form/login.phtml

@@ -27,6 +27,8 @@
     <dd id="locale-element">
       <?php echo $this->element->getElement('locale') ?>
     </dd>
+
+    <?php echo $this->element->getElement('csrf') ?>
     
     <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
         <dt id="reset-label" class="hidden">&nbsp;</dt>

airtime_mvc/application/views/scripts/form/preferences.phtml

@@ -1,5 +1,5 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
-
+    <?php echo $this->element->getElement('csrf') ?>
     <?php echo $this->element->getSubform('preferences_general') ?>
 
     <h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><? echo _("SoundCloud Settings") ?></h3>