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

Conflicts:
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/js/airtime/library/library.js
	airtime_mvc/public/js/airtime/library/spl.js

airtime_mvc/public/css/dashboard.css

@@ -42,13 +42,6 @@
     }
 }
 
-@media screen and (max-width: 1265px) {
-    .dataTables_length > label {
-        /* Hacky, but datatables dumps the select inside the label for some reason... */
-        font-size: 0 !important;
-    }
-}
-
 @media screen and (max-width: 1200px) {
     .wrapper {
         -webkit-flex-flow: column !important;
@@ -339,6 +332,9 @@ thead th.ui-state-default:focus {
 .sb-options-form label {
     color: #efefef;
     line-height: 26px;
+    display: inline-block;
+    padding: 0 0 0 4px;
+    vertical-align: middle;
 }
 
 #sb_show_filter {
@@ -346,6 +342,11 @@ thead th.ui-state-default:focus {
     position: absolute;
 }
 
+#sb_my_shows {
+    top: 1px;
+    left: 2px;
+}
+
 .nav-tabs {
     border-bottom: 1px solid #5b5b5b;
     font-family: Arial, Helvetica, sans-serif;
@@ -536,10 +537,10 @@ li.ui-state-default {
 }
 
 .spl_sortable {
-    position: relative;
     height: 100%;
     overflow: auto;
     flex: 1 100%;
+    -webkit-flex: 1 100%;
 
     margin: 4px 0;
     min-height: 0;