Merge branch 'saas-dev' into saas-dev-publishing

Conflicts:
	airtime_mvc/application/controllers/ApiController.php

airtime_mvc/application/views/scripts/billing/upgrade.phtml

@@ -265,10 +265,12 @@ echo($currentProduct["name"]);
 //echo Application_Model_Preference::GetPlanLevel();
 ?>
 </p>
+    <!--
     <div class="educational-discount">
         <h4>Are you a student or educator?</h4>
         <p>Sign up on an annual plan before the end of October to receive a special educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
     </div>
+    -->
 
 <h3><?php echo(_pro('Choose a plan: ')); ?></h3>
  <form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo

airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml

@@ -0,0 +1,9 @@
+<div class="suspension_notice">
+    <H2>Station Suspended</H2>
+    <p>
+        <?php echo(_pro(sprintf('Your free trial is now over. To restore your station, <a href="%s">please upgrade your plan now</a>.', '/billing/upgrade'))); ?>
+    </p>
+    <p>
+        <?php echo(_pro(sprintf('Your station will be <b>removed</b> within 7 days if you do not upgrade. If you believe this suspension was in error, <a href="%s">please contact support</a>.', 'https://sourcefabricberlin.zendesk.com/anonymous_requests/new'))); ?>
+    </p>
+</div>