Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

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

@@ -34,7 +34,7 @@
       <li>
         <div id="live_dj_div">
           <a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a>
-          Live DJ
+          Show Source
           <div class="line-to-on-air off"></div>
           <a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a>
           <div class="line-to-switch off"></div>
@@ -43,7 +43,7 @@
       <li>
         <div id="master_dj_div">
           <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
-          Master DJ
+          Master Source
           <div class="line-to-on-air off"></div>
           <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
           <div class="line-to-switch off"></div>

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -402,7 +402,6 @@ function setAddShowEvents() {
 		calculateDuration(endDateTime, startDateTime);
 	});
 
-	
     if($('#cb_custom_auth').attr('checked')){
         $('#custom_auth_div').show()
     }else{