Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas

Conflicts:
	airtime_mvc/application/views/scripts/partialviews/trialBox.phtml

airtime_mvc/public/css/billing.css

@@ -7,6 +7,19 @@
 	margin-bottom: 30px;
 }
 
+.billing-panel h3
+{
+	color: #222;
+}
+
+.billing-panel h4
+{
+    font-size: 1.25em;
+    margin: 0px;
+    color: #333;
+    font-weight: normal;
+}
+
 #upgrade-downgrade
 {
 	border: 0px solid #000;
@@ -105,8 +118,15 @@
 	margin-bottom: 30px;
 }
 
-#total_box
+#vat_disclaimer2
 {
+    float:right;
+    width: 200px;
+}
+
+#subtotal_box, #total_box
+{
+	position: relative;
 	text-align: right;
 	margin-top: 30px;
 	margin-bottom: 10px;
@@ -114,6 +134,23 @@
 	background: #ccc;
 	padding: 5px;
 }
+#total_box
+{
+	margin-top: 10px;
+}
+
+#total
+{
+	border-bottom: 3px double;
+}
+
+#savings
+{
+	/*line-height: 30px;*/
+	position: absolute;
+	bottom: 5px;
+	left: 5px;
+}
 
 #paymentmethod
 {