Merge branch 'saas' into saas-embed-player

Conflicts:
	airtime_mvc/application/configs/ACL.php

airtime_mvc/application/views/scripts/menu.phtml

@@ -1,4 +1,4 @@
-<ul id="nav">
+<ol id="navlist">
 <?php foreach ($this->container as $page) : ?>
     <?php if($this->navigation()->accept($page)) : ?>
 	    <li class="top <?php if($page->isActive(true)){echo 'active';} ?>">
@@ -29,4 +29,4 @@
 	    </li>
     <?php endif; ?>
 <?php endforeach; ?>
-</ul>
+</ol>

airtime_mvc/application/views/scripts/thank-you/index.phtml

@@ -0,0 +1,20 @@
+<script type="text/javascript">
+    $(document).ready(function() {
+        <?php if ($this->gaEventTrackingJsCode != "") {
+            echo($this->gaEventTrackingJsCode);
+        ?>
+        jQuery.post("<?=$this->conversionUrl?>", { "csrf_token" : $("#csrf").attr('value')},
+            function( data ) {});
+        <?php }; //endif ?>
+    });
+</script>
+<?php echo $this->form->getElement('csrf') ?>
+
+<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong thankyou-panel">
+    <center>
+        <div class="logobox" style="margin-left: 32px;"></div>
+        <h2><?php echo _pro("Thank you!")?></h2>
+        <h3><?php echo _pro("Your station has been upgraded successfully.")?></h3>
+        <p><a href="<?=$this->stationUrl?>"><?php echo _pro("Return to Airtime")?></a></p>
+    </center>
+</div>