Merge branch '2.5.x' into 2.5.x-installer

Conflicts:
	airtime_mvc/public/index.php

airtime_mvc/public/css/styles.css

@@ -143,8 +143,22 @@ select {
 * html .clearfix, * html li { height: 1%;}
 .clearfix, #side_playlist li {    display: block;    }
 
-
 /* Master Panel */
+
+.sticky {
+    position: fixed;
+    width: 100%;
+    left: 0;
+    top: 0;
+    z-index: 2000;
+    border-top: 0;
+}
+
+.push {
+    width: 100%;
+    height: 139px;
+}
+
 #sticky {
     position:fixed;
     height:130px;
@@ -152,7 +166,6 @@ select {
     left:0;
 }
 
-
 #master-panel {
     background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0;
     height:100px;
@@ -363,6 +376,8 @@ select {
 
 
 .wrapper {
+    position: absolute;
+    top: 139px;
     margin: 0 5px 0 5px;
     padding:10px 0 0 0;
 }
@@ -1110,10 +1125,10 @@ input[type="checkbox"] {
     left:0;
     margin-bottom:140px;
 }*/
-.sticky {
-    padding:0;
-    width:100%;
-}
+/*.sticky {*/
+    /*padding:0;*/
+    /*width:100%;*/
+/*}*/
 
 .floated-panel {
     margin-top:0;
@@ -2122,6 +2137,7 @@ span.errors.sp-errors{
 }
 .preferences {
     width: 500px;
+    margin-bottom: 40px;
 }
 .manage-folders {
     width: 610px;
@@ -2186,6 +2202,19 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
     height: 120px;
 }
 
+.preferences #stationLogoRemove-label {
+    display: none;
+}
+
+.preferences #logo-remove-btn {
+    float: right;
+    margin-bottom: 4px;
+}
+
+.preferences #Logo-img-container {
+    margin-top: 30px;
+}
+
 #show_time_info {
     font-size:12px;
     height:30px;