diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 7ae9e7388..1e0b31cf4 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -11,6 +11,7 @@ require_once __DIR__."/configs/constants.php";
 require_once 'Preference.php';
 require_once 'Locale.php';
 require_once "DateHelper.php";
+require_once "HTTPHelper.php";
 require_once "OsPath.php";
 require_once "Database.php";
 require_once "Timezone.php";
diff --git a/airtime_mvc/application/common/DateHelper.php b/airtime_mvc/application/common/DateHelper.php
index ba280d285..354b8f3dc 100644
--- a/airtime_mvc/application/common/DateHelper.php
+++ b/airtime_mvc/application/common/DateHelper.php
@@ -443,5 +443,59 @@ class Application_Common_DateHelper
     
         return $res;
     }
+
+    /**
+     * Returns date fields from give start and end teimstamp strings
+     * if no start or end parameter is passed start will be set to 1 
+     * in the past and end to now
+     *
+     * @param  string  startTimestamp Y-m-d H:i:s
+     * @param  string  endTImestamp Y-m-d H:i:s
+     * @param  string  timezone (ex UTC) of the start and end parameters
+     * @return array (start DateTime, end DateTime) in UTC timezone
+     */
+    public static function getStartEnd($startTimestamp, $endTimestamp, $timezone)
+    {
+        $prefTimezone = Application_Model_Preference::GetTimezone();
+        $utcTimezone = new DateTimeZone("UTC");
+        $utcNow = new DateTime("now", $utcTimezone);
+
+        if (empty($timezone)) {
+            $userTimezone = new DateTimeZone($prefTimezone);
+        } else {
+            $userTimezone = new DateTimeZone($timezone);
+        }
+
+        // default to 1 day
+        if (empty($startTimestamp) || empty($endTimestamp)) {
+            $startsDT = clone $utcNow;
+            $startsDT->sub(new DateInterval("P1D"));
+            $endsDT = clone $utcNow;
+        } else {
+             
+            try {
+                $startsDT = new DateTime($startTimestamp, $userTimezone);
+                $startsDT->setTimezone($utcTimezone);
+    
+                $endsDT = new DateTime($endTimestamp, $userTimezone);
+                $endsDT->setTimezone($utcTimezone);
+    
+                if ($startsDT > $endsDT) {
+                    throw new Exception("start greater than end");
+                }
+            }
+            catch (Exception $e) {
+                Logging::info($e);
+                Logging::info($e->getMessage());
+    
+                $startsDT = clone $utcNow;
+                $startsDT->sub(new DateInterval("P1D"));
+                $endsDT = clone $utcNow;
+            }
+             
+        }
+         
+        return array($startsDT, $endsDT);
+    }
 }
 
diff --git a/airtime_mvc/application/common/HTTPHelper.php b/airtime_mvc/application/common/HTTPHelper.php
new file mode 100644
index 000000000..db314bb0b
--- /dev/null
+++ b/airtime_mvc/application/common/HTTPHelper.php
@@ -0,0 +1,20 @@
+<?php
+
+class Application_Common_HTTPHelper
+{
+    /**
+     * Returns start and end DateTime vars from given 
+     * HTTP Request object
+     *
+     * @param Request
+     * @return array(start DateTime, end DateTime)
+     */
+    public static function getStartEndFromRequest($request)
+    {
+        return Application_Common_DateHelper::getStartEnd(
+            $request->getParam("start", null),
+            $request->getParam("end", null),
+            $request->getParam("timezone", null)
+        );
+    }
+}
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 6448342ae..2ee20b3e7 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -5,8 +5,17 @@ class ApiController extends Zend_Controller_Action
 
     public function init()
     {
-        $ignoreAuth = array("live-info", "live-info-v2", "week-info", 
-                    "station-metadata", "station-logo");
+        $ignoreAuth = array("live-info", 
+            "live-info-v2", 
+            "week-info", 
+            "station-metadata", 
+            "station-logo",
+            "show-history-feed", 
+            "item-history-feed",
+            "shows",
+            "show-tracks",
+            "show-schedules"
+        );
 
         $params = $this->getRequest()->getParams();
         if (!in_array($params['action'], $ignoreAuth)) {
@@ -274,10 +283,10 @@ class ApiController extends Zend_Controller_Action
                 $utcTimeEnd = $end->format("Y-m-d H:i:s");
                 
                 $result = array(
-                        "env" => APPLICATION_ENV,
-                        "schedulerTime" => $utcTimeNow,
-                        "currentShow" => Application_Model_Show::getCurrentShow($utcTimeNow),
-                        "nextShow" => Application_Model_Show::getNextShows($utcTimeNow, $limit, $utcTimeEnd)
+                    "env" => APPLICATION_ENV,
+                    "schedulerTime" => $utcTimeNow,
+                    "currentShow" => Application_Model_Show::getCurrentShow($utcTimeNow),
+                    "nextShow" => Application_Model_Show::getNextShows($utcTimeNow, $limit, $utcTimeEnd)
                 );
             } else {
                 $result = Application_Model_Schedule::GetPlayOrderRangeOld($limit);
@@ -484,9 +493,9 @@ class ApiController extends Zend_Controller_Action
                     $shows,
                     array("starts", "ends", "start_timestamp","end_timestamp"),
                     $timezone
-                  );
+                );
 
-                  $result[$dow[$i]] = $shows;
+                $result[$dow[$i]] = $shows;
             }
 
             // XSS exploit prevention
@@ -1320,4 +1329,175 @@ class ApiController extends Zend_Controller_Action
             Application_Model_StreamSetting::SetListenerStatError($k, $v);
         }
     }
+
+    /**
+     * display played items for a given time range and show instance_id
+     *
+     * @return json array
+     */
+    public function itemHistoryFeedAction()
+    {
+        try {
+            $request = $this->getRequest();
+            $params = $request->getParams();
+            $instance = $request->getParam("instance_id", null);
+
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
+
+            $historyService = new Application_Service_HistoryService();
+            $results = $historyService->getPlayedItemData($startsDT, $endsDT, $params, $instance);
+
+            $this->_helper->json->sendJson($results['history']);
+    }
+        catch (Exception $e) {
+            Logging::info($e);
+            Logging::info($e->getMessage());
+        }
+    }
+
+    /**
+     * display show schedules for a given time range and show instance_id
+     *
+     * @return json array
+     */
+    public function showHistoryFeedAction()
+    {
+        try {
+            $request = $this->getRequest();
+            $params = $request->getParams();
+            $userId = $request->getParam("user_id", null);
+ 
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
+            
+            $historyService = new Application_Service_HistoryService();
+            $shows = $historyService->getShowList($startsDT, $endsDT, $userId);
+
+            $this->_helper->json->sendJson($shows);
+        }
+        catch (Exception $e) {
+            Logging::info($e);
+            Logging::info($e->getMessage());
+        }
+    }
+
+    /**
+     * display show info (without schedule) for given show_id
+     *
+     * @return json array
+     */
+    public function showsAction()
+    {
+        try {
+            $request = $this->getRequest();
+            $params = $request->getParams();
+            $showId = $request->getParam("show_id", null);
+            $results = array();
+ 
+            if (empty($showId)) {            
+                $shows = CcShowQuery::create()->find();
+                foreach($shows as $show) {
+                    $results[] = $show->getShowInfo();
+                }
+            } else {
+                $show = CcShowQuery::create()->findPK($showId);
+                $results[] = $show->getShowInfo();
+            }
+
+            $this->_helper->json->sendJson($results);
+        }
+        catch (Exception $e) {
+            Logging::info($e);
+            Logging::info($e->getMessage());
+        }
+    }
+   
+    /**
+     * display show schedule for given show_id
+     *
+     * @return json array
+     */
+    public function showSchedulesAction() 
+    {
+        try {
+            $request = $this->getRequest();
+            $params = $request->getParams();
+            $showId = $request->getParam("show_id", null);
+ 
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
+
+            if ((!isset($showId)) || (!is_numeric($showId))) {
+            //if (!isset($showId)) {
+                $this->_helper->json->sendJson(
+                    array("jsonrpc" => "2.0", "error" => array("code" => 400, "message" => "missing invalid type for required show_id parameter. use type int.".$showId))
+                );
+            }
+            
+            $shows = Application_Model_Show::getShows($startsDT, $endsDT, FALSE, $showId);
+
+            // is this a valid show?
+            if (empty($shows)) {
+                $this->_helper->json->sendJson(
+                    array("jsonrpc" => "2.0", "error" => array("code" => 204, "message" => "no content for requested show_id"))
+                );
+            }
+
+            $this->_helper->json->sendJson($shows);
+        }
+        catch (Exception $e) {
+            Logging::info($e);
+            Logging::info($e->getMessage());
+        }
+
+    }
+    
+    /**
+     * displays track listing for given instance_id
+     *
+     * @return json array
+     */
+    public function showTracksAction()
+    {
+        $baseUrl = Application_Common_OsPath::getBaseDir();
+        $prefTimezone = Application_Model_Preference::GetTimezone();
+
+        $instanceId = $this->_getParam('instance_id');
+
+        if ((!isset($instanceId)) || (!is_numeric($instanceId))) {
+            $this->_helper->json->sendJson(
+                array("jsonrpc" => "2.0", "error" => array("code" => 400, "message" => "missing invalid type for required instance_id parameter. use type int"))
+            );
+        }
+
+        $showInstance = new Application_Model_ShowInstance($instanceId);
+        $showInstanceContent = $showInstance->getShowListContent($prefTimezone);
+        
+        // is this a valid show instance with content?
+        if (empty($showInstanceContent)) {
+            $this->_helper->json->sendJson(
+                array("jsonrpc" => "2.0", "error" => array("code" => 204, "message" => "no content for requested instance_id"))
+            );
+        }
+
+        $result = array();
+        $position = 0;
+        foreach ($showInstanceContent as $track) {
+
+            $elementMap = array(
+                'title' => isset($track['track_title']) ? $track['track_title'] : "",
+                'artist' => isset($track['creator']) ? $track['creator'] : "",
+                'position' => $position,
+                'id' => ++$position,
+                'mime' => isset($track['mime'])?$track['mime']:"",
+                'starts' => isset($track['starts']) ? $track['starts'] : "",
+                'length' => isset($track['length']) ? $track['length'] : "",
+                'file_id' => ($track['type'] == 0) ? $track['item_id'] :  $track['filepath']
+            );
+
+            $result[] = $elementMap;
+        }
+
+        $this->_helper->json($result);
+
+    }
+    
 }
diff --git a/airtime_mvc/application/controllers/ListenerstatController.php b/airtime_mvc/application/controllers/ListenerstatController.php
index 5f5250b9c..6e2b93aee 100644
--- a/airtime_mvc/application/controllers/ListenerstatController.php
+++ b/airtime_mvc/application/controllers/ListenerstatController.php
@@ -10,49 +10,6 @@ class ListenerstatController extends Zend_Controller_Action
         ->initContext();
     }
     
-    private function getStartEnd()
-    {
-    	$request = $this->getRequest();
-    
-    	$userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
-    	$utcTimezone = new DateTimeZone("UTC");
-    	$utcNow = new DateTime("now", $utcTimezone);
-    
-    	$start = $request->getParam("start");
-    	$end = $request->getParam("end");
-    
-    	if (empty($start) || empty($end)) {
-    		$startsDT = clone $utcNow;
-    		$startsDT->sub(new DateInterval("P1D"));
-    		$endsDT = clone $utcNow;
-    	}
-    	else {
-    		 
-    		try {
-    			$startsDT = new DateTime($start, $userTimezone);
-    			$startsDT->setTimezone($utcTimezone);
-    
-    			$endsDT = new DateTime($end, $userTimezone);
-    			$endsDT->setTimezone($utcTimezone);
-    
-    			if ($startsDT > $endsDT) {
-    				throw new Exception("start greater than end");
-    			}
-    		}
-    		catch (Exception $e) {
-    			Logging::info($e);
-    			Logging::info($e->getMessage());
-    
-    			$startsDT = clone $utcNow;
-    			$startsDT->sub(new DateInterval("P1D"));
-    			$endsDT = clone $utcNow;
-    		}
-    		 
-    	}
-    
-    	return array($startsDT, $endsDT);
-    }
-
     public function indexAction()
     {
         $CC_CONFIG = Config::getConfig();
@@ -69,7 +26,7 @@ class ListenerstatController extends Zend_Controller_Action
 
         $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']);
 
-        list($startsDT, $endsDT) = $this->getStartEnd();
+        list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
         $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
         $startsDT->setTimezone($userTimezone);
         $endsDT->setTimezone($userTimezone);
@@ -98,7 +55,7 @@ class ListenerstatController extends Zend_Controller_Action
     }
 
     public function getDataAction(){
-        list($startsDT, $endsDT) = $this->getStartEnd();
+        list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());
         
         $data = Application_Model_ListenerStat::getDataPointsWithinRange($startsDT->format("Y-m-d H:i:s"), $endsDT->format("Y-m-d H:i:s"));
         $this->_helper->json->sendJson($data);
diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php
index 077cce0b2..7b82f7dfd 100644
--- a/airtime_mvc/application/controllers/PlayouthistoryController.php
+++ b/airtime_mvc/application/controllers/PlayouthistoryController.php
@@ -19,56 +19,13 @@ class PlayouthistoryController extends Zend_Controller_Action
             ->initContext();
     }
     
-    private function getStartEnd()
-    {
-    	$request = $this->getRequest();
-    	 
-    	$userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
-    	$utcTimezone = new DateTimeZone("UTC");
-    	$utcNow = new DateTime("now", $utcTimezone);
-    	 
-    	$start = $request->getParam("start");
-    	$end = $request->getParam("end");
-    
-    	if (empty($start) || empty($end)) {
-    		$startsDT = clone $utcNow;
-    		$startsDT->sub(new DateInterval("P1D"));
-    		$endsDT = clone $utcNow;
-    	}
-    	else {
-    		 
-    		try {
-    			$startsDT = new DateTime($start, $userTimezone);
-    			$startsDT->setTimezone($utcTimezone);
-    
-    			$endsDT = new DateTime($end, $userTimezone);
-    			$endsDT->setTimezone($utcTimezone);
-    
-    			if ($startsDT > $endsDT) {
-    				throw new Exception("start greater than end");
-    			}
-    		}
-    		catch (Exception $e) {
-    			Logging::info($e);
-    			Logging::info($e->getMessage());
-    
-    			$startsDT = clone $utcNow;
-    			$startsDT->sub(new DateInterval("P1D"));
-    			$endsDT = clone $utcNow;
-    		}
-    		 
-    	}
-    	 
-    	return array($startsDT, $endsDT);
-    }
-
     public function indexAction()
     {
         $CC_CONFIG = Config::getConfig();
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
-        list($startsDT, $endsDT) = $this->getStartEnd();
-        
+        list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($this->getRequest());
+       
         $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
         $startsDT->setTimezone($userTimezone);
         $endsDT->setTimezone($userTimezone);
@@ -123,7 +80,7 @@ class PlayouthistoryController extends Zend_Controller_Action
     		$params = $request->getParams();
     		$instance = $request->getParam("instance_id", null);
 	        
-    		list($startsDT, $endsDT) = $this->getStartEnd();
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
 
 	        $historyService = new Application_Service_HistoryService();
 	        $r = $historyService->getFileSummaryData($startsDT, $endsDT, $params);
@@ -146,7 +103,7 @@ class PlayouthistoryController extends Zend_Controller_Action
     		$params = $request->getParams();
     		$instance = $request->getParam("instance_id", null);
 	        
-    		list($startsDT, $endsDT) = $this->getStartEnd();
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
     		
 	        $historyService = new Application_Service_HistoryService();
 	        $r = $historyService->getPlayedItemData($startsDT, $endsDT, $params, $instance);
@@ -169,7 +126,7 @@ class PlayouthistoryController extends Zend_Controller_Action
     		$params = $request->getParams();
     		$instance = $request->getParam("instance_id", null);
 	        
-    		list($startsDT, $endsDT) = $this->getStartEnd();
+            list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
 
     		$historyService = new Application_Service_HistoryService();
     		$shows = $historyService->getShowList($startsDT, $endsDT);
diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 7df1bb7ad..9abbeb167 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -236,49 +236,6 @@ class ShowbuilderController extends Zend_Controller_Action
         $this->view->dialog = $this->view->render('showbuilder/builderDialog.phtml');
     }
     
-    private function getStartEnd()
-    {
-    	$request = $this->getRequest();
-    
-    	$userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
-    	$utcTimezone = new DateTimeZone("UTC");
-    	$utcNow = new DateTime("now", $utcTimezone);
-    
-    	$start = $request->getParam("start");
-    	$end = $request->getParam("end");
-    
-    	if (empty($start) || empty($end)) {
-    		$startsDT = clone $utcNow;
-    		$startsDT->sub(new DateInterval("P1D"));
-    		$endsDT = clone $utcNow;
-    	}
-    	else {
-    		 
-    		try {
-    			$startsDT = new DateTime($start, $userTimezone);
-    			$startsDT->setTimezone($utcTimezone);
-    
-    			$endsDT = new DateTime($end, $userTimezone);
-    			$endsDT->setTimezone($utcTimezone);
-    
-    			if ($startsDT > $endsDT) {
-    				throw new Exception("start greater than end");
-    			}
-    		}
-    		catch (Exception $e) {
-    			Logging::info($e);
-    			Logging::info($e->getMessage());
-    
-    			$startsDT = clone $utcNow;
-    			$startsDT->sub(new DateInterval("P1D"));
-    			$endsDT = clone $utcNow;
-    		}
-    		 
-    	}
-    
-    	return array($startsDT, $endsDT);
-    }
-
     public function checkBuilderFeedAction()
     {
         $request = $this->getRequest();
@@ -287,7 +244,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $timestamp = intval($request->getParam("timestamp", -1));
         $instances = $request->getParam("instances", array());
 
-        list($startsDT, $endsDT) = $this->getStartEnd();
+        list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
 
         $opts = array("myShows" => $my_shows, "showFilter" => $show_filter);
         $showBuilder = new Application_Model_ShowBuilder($startsDT, $endsDT, $opts);
@@ -307,7 +264,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $show_instance_filter = intval($request->getParam("showInstanceFilter", 0));
         $my_shows = intval($request->getParam("myShows", 0));
 
-        list($startsDT, $endsDT) = $this->getStartEnd();
+        list($startsDT, $endsDT) = Application_Common_HTTPHelper::getStartEndFromRequest($request);
 
         $opts = array("myShows" => $my_shows,
                 "showFilter" => $show_filter,
diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 34b60e704..8828c925c 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -34,11 +34,9 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         		'required'   => true,
         		'filters'    => array('StringTrim'),
         		'validators' => array(
-        				array(
-        						$rangeValidator,
-        						$notEmptyValidator,
-        						'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
-        				)
+                    $rangeValidator,
+                    $notEmptyValidator,
+                    array('regex', false, array('/^[0-9]+(\.\d+)?$/', 'messages' => _('Please enter a time in seconds (eg. 0.5)')))
         		),
         		'value' => Application_Model_Preference::GetDefaultCrossfadeDuration(),
         		'decorators' => array(
@@ -53,11 +51,9 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
             'required'   => true,
             'filters'    => array('StringTrim'),
             'validators' => array(
-                array(
-                    $rangeValidator,
-                    $notEmptyValidator,
-                    'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
-                )
+                $rangeValidator,
+                $notEmptyValidator,
+                array('regex', false, array('/^[0-9]+(\.\d+)?$/', 'messages' => _('Please enter a time in seconds (eg. 0.5)')))
             ),
             'value' => $defaultFadeIn,
             'decorators' => array(
@@ -72,12 +68,10 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         		'required'   => true,
         		'filters'    => array('StringTrim'),
         		'validators' => array(
-        				array(
-        						$rangeValidator,
-        						$notEmptyValidator,
-        						'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
-        				)
-        		),
+                    $rangeValidator,
+                    $notEmptyValidator,
+                    array('regex', false, array('/^[0-9]+(\.\d+)?$/', 'messages' => _('Please enter a time in seconds (eg. 0.5)')))
+                ),
         		'value' => $defaultFadeOut,
         		'decorators' => array(
         				'ViewHelper'
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index 3058080c0..35b6909a9 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -10,9 +10,6 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $isStreamConfigable = Application_Model_Preference::GetEnableStreamConf() == "true";
 
         $defaultFade = Application_Model_Preference::GetDefaultTransitionFade();
-        if ($defaultFade == "") {
-            $defaultFade = '00.000000';
-        }
 
         // automatic trasition on source disconnection
         $auto_transition = new Zend_Form_Element_Checkbox("auto_transition");
@@ -32,8 +29,8 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $transition_fade = new Zend_Form_Element_Text("transition_fade");
         $transition_fade->setLabel(_("Switch Transition Fade (s)"))
                         ->setFilters(array('StringTrim'))
-                        ->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,6})?$/',
-                        'messages' => _('enter a time in seconds 00{.000000}')))
+                        ->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,3})?$/',
+                        'messages' => _('enter a time in seconds 0{.000}')))
                         ->setValue($defaultFade)
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($transition_fade);
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 848792318..e568e0159 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -263,7 +263,7 @@ class Application_Model_Preference
     
         if ($fade === "") {
             // the default value of the fade is 00.5
-            return "00.5";
+            return "0.5";
         }
     
         return $fade;
@@ -279,8 +279,8 @@ class Application_Model_Preference
         $fade = self::getValue("default_fade_out");
     
         if ($fade === "") {
-            // the default value of the fade is 00.5
-            return "00.5";
+            // the default value of the fade is 0.5
+            return "0.5";
         }
     
         return $fade;
@@ -291,33 +291,6 @@ class Application_Model_Preference
         self::setValue("default_fade", $fade);
     }
 
-    public static function GetDefaultFade()
-    {
-        $fade = self::getValue("default_fade");
-
-        if ($fade === "") {
-            // the default value of the fade is 00.5
-            return "00.5";
-        }
-
-        // we need this function to work with 2.0 version on default_fade value in cc_pref
-        // it has 00:00:00.000000 format where in 2.1 we have 00.000000 format
-        if (preg_match("/([0-9]{2}):([0-9]{2}):([0-9]{2}).([0-9]{6})/", $fade, $matches) == 1 && count($matches) == 5) {
-            $out = 0;
-            $out += intval($matches[1] * 3600);
-            $out += intval($matches[2] * 60);
-            $out += intval($matches[3]);
-            $out .= ".$matches[4]";
-            $fade = $out;
-        }
-
-        $fade = number_format($fade, 1, '.', '');
-        //fades need 2 leading zeros for DateTime conversion
-        $fade = str_pad($fade, 4, "0", STR_PAD_LEFT);
-
-        return $fade;
-    }
-
     public static function SetDefaultTransitionFade($fade)
     {
         self::setValue("default_transition_fade", $fade);
@@ -330,7 +303,7 @@ class Application_Model_Preference
     public static function GetDefaultTransitionFade()
     {
         $transition_fade = self::getValue("default_transition_fade");
-        return ($transition_fade == "") ? "00.000000" : $transition_fade;
+        return ($transition_fade == "") ? "0.000" : $transition_fade;
     }
 
     public static function SetStreamLabelFormat($type)
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 987b5a6c2..46997e998 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -862,9 +862,11 @@ SQL;
      *      In UTC time.
      * @param  unknown_type $excludeInstance
      * @param  boolean      $onlyRecord
+     * @param  int          $showId
+     *      limits the results to instances of a given showId only
      * @return array
      */
-    public static function getShows($start_timestamp, $end_timestamp, $onlyRecord=FALSE)
+    public static function getShows($start_timestamp, $end_timestamp, $onlyRecord=FALSE, $showId=null)
     {
         self::createAndFillShowInstancesPastPopulatedUntilDate($end_timestamp);
 
@@ -895,13 +897,21 @@ SQL;
         //only want shows that are starting at the time or later.
         $start_string = $start_timestamp->format("Y-m-d H:i:s");
         $end_string = $end_timestamp->format("Y-m-d H:i:s");
+
+        $params = array();
+
+        if ($showId) {
+            $sql .= " AND (si1.show_id = :show_id)";
+            $params[':show_id'] = $showId; 
+        }
+
         if ($onlyRecord) {
             $sql .= " AND (si1.starts >= :start::TIMESTAMP AND si1.starts < :end::TIMESTAMP)";
             $sql .= " AND (si1.record = 1)";
 
-            return Application_Common_Database::prepareAndExecute( $sql,
-                array( ':start' => $start_string,
-                       ':end'   => $end_string ), 'all');
+            $params[':start'] = $start_string;
+            $params[':end'] = $end_string;
+            return Application_Common_Database::prepareAndExecute( $sql, $params, 'all');
 
         } else {
             $sql .= " ". <<<SQL
@@ -910,15 +920,16 @@ AND ((si1.starts >= :start1::TIMESTAMP AND si1.starts < :end1::TIMESTAMP)
      OR (si1.starts <= :start3::TIMESTAMP AND si1.ends >= :end3::TIMESTAMP))
 ORDER BY si1.starts
 SQL;
-            return Application_Common_Database::prepareAndExecute( $sql,
-                array(
+            $params = array_merge($params, array(
                     'start1' => $start_string,
                     'start2' => $start_string,
                     'start3' => $start_string,
                     'end1'   => $end_string,
                     'end2'   => $end_string,
                     'end3'   => $end_string
-                ), 'all');
+                )
+            );
+            return Application_Common_Database::prepareAndExecute( $sql, $params, 'all');
         }
     }
 
@@ -1013,10 +1024,10 @@ SQL;
             
             //for putting the now playing icon on the show.
             if ($now > $startsDT && $now < $endsDT) {
-            	$event["nowPlaying"] = true;
+                $event["nowPlaying"] = true;
             }
             else {
-            	$event["nowPlaying"] = false;
+                $event["nowPlaying"] = false;
             }
 
             //event colouring
@@ -1045,9 +1056,9 @@ SQL;
      **/
     private static function getPercentScheduled($p_starts, $p_ends, $p_time_filled)
     {
-    	$utcTimezone = new DatetimeZone("UTC");
-    	$startDt = new DateTime($p_starts, $utcTimezone);
-    	$endDt = new DateTime($p_ends, $utcTimezone);
+        $utcTimezone = new DatetimeZone("UTC");
+        $startDt = new DateTime($p_starts, $utcTimezone);
+        $endDt = new DateTime($p_ends, $utcTimezone);
         $durationSeconds = intval($endDt->format("U")) - intval($startDt->format("U"));
         $time_filled = Application_Common_DateHelper::playlistTimeToSeconds($p_time_filled);
         if ($durationSeconds != 0) { //Prevent division by zero if the show duration somehow becomes zero.
@@ -1448,4 +1459,5 @@ SQL;
 
         return array($start, $end);
     }
+
 }
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index f5fbf1aa7..7631f9e9c 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -548,7 +548,7 @@ SQL;
 
     }
 
-    public function getShowListContent()
+    public function getShowListContent($timezone = null)
     {
         $con = Propel::getConnection();
 
@@ -599,9 +599,14 @@ SQL;
             ':instance_id2' => $this->_instanceId
         ));
         $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        
-        $userTimezone = Application_Model_Preference::GetUserTimezone();
-        $displayTimezone = new DateTimeZone($userTimezone);
+       
+        if (isset($timezone)) {
+            $displayTimezone = new DateTimeZone($timezone);
+        } else { 
+            $userTimezone = Application_Model_Preference::GetUserTimezone();
+            $displayTimezone = new DateTimeZone($userTimezone);
+        }
+
         $utcTimezone = new DateTimeZone("UTC");
 
         foreach ($results as &$row) {
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index 21c794b07..a7e7d82b1 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -309,7 +309,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             $media_url = self::getXspfUrl($url);
         } elseif (preg_match("/pls\+xml/", $mime) || preg_match("/x-scpls/", $mime)) {
             $media_url = self::getPlsUrl($url);
-        } elseif (preg_match("/(mpeg|ogg|audio\/aacp)/", $mime)) {
+        } elseif (preg_match("/(mpeg|ogg|audio\/aacp|audio\/aac)/", $mime)) {
             if ($content_length_found) {
                 throw new Exception(_("Invalid webstream - This appears to be a file download."));
             }
diff --git a/airtime_mvc/application/models/airtime/CcShow.php b/airtime_mvc/application/models/airtime/CcShow.php
index b9f140e3e..ee0c75454 100644
--- a/airtime_mvc/application/models/airtime/CcShow.php
+++ b/airtime_mvc/application/models/airtime/CcShow.php
@@ -304,4 +304,23 @@ class CcShow extends BaseCcShow {
             ->filterByDbId($instanceId, Criteria::NOT_EQUAL)
             ->find();
     }
+
+    public function getShowInfo()
+    {
+        $info = array();
+        if ($this->getDbId() == null) {
+            return $info;
+        } else {
+            $info['name'] = $this->getDbName();
+            $info['id'] = $this->getDbId();
+            $info['url'] = $this->getDbUrl();
+            $info['genre'] = $this->getDbGenre();
+            $info['description'] = $this->getDbDescription();
+            $info['color'] = $this->getDbColor();
+            $info['background_color'] = $this->getDbBackgroundColor();
+            $info['linked'] = $this->getDbLinked();
+            return $info;
+        }
+
+    }
 } // CcShow
diff --git a/airtime_mvc/application/services/HistoryService.php b/airtime_mvc/application/services/HistoryService.php
index 73821ce92..181e55a67 100644
--- a/airtime_mvc/application/services/HistoryService.php
+++ b/airtime_mvc/application/services/HistoryService.php
@@ -204,30 +204,34 @@ class Application_Service_HistoryService
 		//------------------------------------------------------------------------
 		//Using Datatables parameters to sort the data.
 
-		$numOrderColumns = $opts["iSortingCols"];
-		$orderBys = array();
+        if (empty($opts["iSortingCols"])) {
+		    $orderBys = array();
+        } else {
+            $numOrderColumns = $opts["iSortingCols"];
+            $orderBys = array();
 
-		for ($i = 0; $i < $numOrderColumns; $i++) {
+            for ($i = 0; $i < $numOrderColumns; $i++) {
 
-			$colNum = $opts["iSortCol_".$i];
-			$key = $opts["mDataProp_".$colNum];
-			$sortDir = $opts["sSortDir_".$i];
+                $colNum = $opts["iSortCol_".$i];
+                $key = $opts["mDataProp_".$colNum];
+                $sortDir = $opts["sSortDir_".$i];
 
-			if (in_array($key, $required)) {
+                if (in_array($key, $required)) {
 
-				$orderBys[] = "history_range.{$key} {$sortDir}";
-			}
-			else if (in_array($key, $filemd_keys)) {
+                    $orderBys[] = "history_range.{$key} {$sortDir}";
+                }
+                else if (in_array($key, $filemd_keys)) {
 
-				$orderBys[] = "file_info.{$key} {$sortDir}";
-			}
-			else if (in_array($key, $general_keys)) {
+                    $orderBys[] = "file_info.{$key} {$sortDir}";
+                }
+                else if (in_array($key, $general_keys)) {
 
-				$orderBys[] = "{$key}_filter.{$key} {$sortDir}";
-			}
-			else {
-				//throw new Exception("Error: $key is not part of the template.");
-			}
+                    $orderBys[] = "{$key}_filter.{$key} {$sortDir}";
+                }
+                else {
+                    //throw new Exception("Error: $key is not part of the template.");
+                }
+            }
 		}
 
 		if (count($orderBys) > 0) {
@@ -241,7 +245,7 @@ class Application_Service_HistoryService
 		//---------------------------------------------------------------
 		//using Datatables parameters to add limits/offsets
 
-		$displayLength = intval($opts["iDisplayLength"]);
+		 $displayLength = empty($opts["iDisplayLength"]) ? -1 : intval($opts["iDisplayLength"]);
 		//limit the results returned.
 		if ($displayLength !== -1) {
 			$mainSqlQuery.=
@@ -275,14 +279,14 @@ class Application_Service_HistoryService
 		foreach ($fields as $index=>$field) {
 
 			if ($field["type"] == TEMPLATE_BOOLEAN) {
-				$boolCast[] = $field["name"];
+				$boolCast[] = $field;
 			}
 		}
 
 		foreach ($rows as $index => &$result) {
 
-			foreach ($boolCast as $name) {
-				$result[$name] = (bool) $result[$name];
+			foreach ($boolCast as $field) {
+				$result[$field['label']] = (bool) $result[$field['name']];
 			}
 
 			//need to display the results in the station's timezone.
@@ -311,7 +315,7 @@ class Application_Service_HistoryService
 		}
 
 		return array(
-			"sEcho" => intval($opts["sEcho"]),
+			"sEcho" => empty($opts["sEcho"]) ? null : intval($opts["sEcho"]),
 			//"iTotalDisplayRecords" => intval($totalDisplayRows),
 			"iTotalDisplayRecords" => intval($totalRows),
 			"iTotalRecords" => intval($totalRows),
@@ -445,9 +449,13 @@ class Application_Service_HistoryService
 		);
 	}
 
-	public function getShowList($startDT, $endDT)
+	public function getShowList($startDT, $endDT, $userId = null)
 	{
-		$user = Application_Model_User::getCurrentUser();
+        if (empty($userId)) {
+		    $user = Application_Model_User::getCurrentUser();
+        } else {
+            $user = new Application_Model_User($userId);
+        }
 		$shows = Application_Model_Show::getShows($startDT, $endDT);
 
 		Logging::info($startDT->format("Y-m-d H:i:s"));
@@ -456,7 +464,7 @@ class Application_Service_HistoryService
 		Logging::info($shows);
 
 		//need to filter the list to only their shows
-		if ($user->isHost()) {
+		if ((!empty($user)) && ($user->isHost())) {
 
 			$showIds = array();
 
@@ -1524,4 +1532,4 @@ class Application_Service_HistoryService
 			throw $e;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
index 053a99b1a..6785de678 100644
Binary files a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
index 20bb72ce5..2f983ee6b 100644
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n"
 "MIME-Version: 1.0\n"
diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
index 63f34c90b..76942ed77 100644
Binary files a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
index 332e5e7ca..d9ad52eea 100644
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/airtime/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
index 508a78ec1..4ca8d6170 100644
Binary files a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
index 72cfe863e..c17dfe604 100644
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 10:52+0000\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
index 3672f9e54..6a2e72329 100644
Binary files a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
index 9047cfb18..ba2c9278b 100644
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
-"Last-Translator: Daniel James <daniel@64studio.com>\n"
+"PO-Revision-Date: 2014-12-23 10:09+0000\n"
+"Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
 "Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Fondu en Sorti"
 msgid ""
 "%1$s copyright &copy; %2$s All rights reserved.%3$sMaintained and "
 "distributed under the %4$s by %5$s"
-msgstr ""
+msgstr "%1$s copyright &copy; %2$s Tous droits réservés.%3$sMaintenue et distribuée sous %4$s by %5$s"
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
@@ -1096,13 +1096,13 @@ msgstr "Envoyez vos remarques au support"
 #: airtime_mvc/application/forms/RegisterAirtime.php:126
 #, php-format
 msgid "Promote my station on %s"
-msgstr ""
+msgstr "Promouvoir station sur %s"
 
 #: airtime_mvc/application/forms/SupportSettings.php:150
 #: airtime_mvc/application/forms/RegisterAirtime.php:151
 #, php-format
 msgid "By checking this box, I agree to %s's %sprivacy policy%s."
-msgstr ""
+msgstr "En cochant cette case , je accepte la %s's %s de politique de confidentialité %s ."
 
 #: airtime_mvc/application/forms/SupportSettings.php:174
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
@@ -1141,7 +1141,7 @@ msgstr "Rediffusion?"
 #: airtime_mvc/application/forms/AddShowLiveStream.php:10
 #, php-format
 msgid "Use %s Authentication:"
-msgstr ""
+msgstr "Utilisez l'authentification %s :"
 
 #: airtime_mvc/application/forms/AddShowLiveStream.php:16
 msgid "Use Custom Authentication:"
@@ -2613,7 +2613,7 @@ msgstr "Vous n'êtes pas autorisé à acceder à cette ressource."
 #: airtime_mvc/application/controllers/ApiController.php:803
 #, php-format
 msgid "File does not exist in %s"
-msgstr ""
+msgstr "Le fichier n'existe pas dans %s"
 
 #: airtime_mvc/application/controllers/ApiController.php:854
 msgid "Bad request. no 'mode' parameter passed."
@@ -2824,7 +2824,7 @@ msgstr "Mémoire"
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
 #, php-format
 msgid "%s Version"
-msgstr ""
+msgstr "%s Version"
 
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:30
 msgid "Disk Space"
@@ -2909,13 +2909,13 @@ msgid ""
 " collected regularly in order to enhance your user experience.%2$sClick "
 "'Yes, help %1$s' and we'll make sure the features you use are constantly "
 "improving."
-msgstr ""
+msgstr "Aidez %1$s nous à l'améliorer en nous faisant savoir comment vous l'utilisez. Cette information sera recueillie régulièrement afin d'améliorer votre expérience utilisateur.\n%2$s Cliquez Oui, aider %1$s et nous vous assurerons que les fonctions que vous utilisez seront en constante amélioration."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:29
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:29
 #, php-format
 msgid "Click the box below to promote your station on %s."
-msgstr ""
+msgstr "Cliquez sur la case ci-dessous pour promouvoir votre station sur %s ."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:67
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:81
@@ -2961,7 +2961,7 @@ msgstr "Répertoire d'Import en Cours:"
 msgid ""
 "Rescan watched directory (This is useful if it is network mount and may be "
 "out of sync with %s)"
-msgstr ""
+msgstr "Rescanner le répertoire surveillé (Ce qui peut être utile si il est sur le réseau et est peut être désynchronisé de %s)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -3016,7 +3016,7 @@ msgid ""
 "will be collected regularly in order to enhance your user experience.%sClick"
 " the 'Send support feedback' box and we'll make sure the features you use "
 "are constantly improving."
-msgstr ""
+msgstr "Aidez %s à améliorer le logiciel en nous faisant savoir comment vous l'utilisez %s. Cette information sera recueillie régulièrement afin d'améliorer votre expérience utilisateur.\n%s Cliquez la case \"Envoyer des rapports d'utilisation» et nous nous assurerons que les fonctions que vous utilisez seront en constante amélioration."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
 msgid ""
@@ -3279,12 +3279,12 @@ msgstr "Nombre d'auditeur au fil du temps"
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
 #, php-format
 msgid "Welcome to %s!"
-msgstr ""
+msgstr "Bienvenue à %s !"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
 #, php-format
 msgid "Here's how you can get started using %s to automate your broadcasts: "
-msgstr ""
+msgstr "Voici comment vous pouvez commencer à utiliser %s pour automatiser vos émissions:"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:7
 msgid ""
@@ -3333,12 +3333,12 @@ msgstr "Selection du Flux:"
 msgid ""
 "%1$s %2$s, the open radio software for scheduling and remote station "
 "management."
-msgstr ""
+msgstr "%1$s %2$s, le logiciel ouvert de gestion et de programmation pour vos stations distantes."
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:22
 #, php-format
 msgid "%1$s %2$s is distributed under the %3$s"
-msgstr ""
+msgstr "%1$s %2$s est distribué sous %3$s"
 
 #: airtime_mvc/application/views/scripts/login/password-change.phtml:3
 msgid "New password"
@@ -3371,7 +3371,7 @@ msgstr "Retour à l'écran de connexion"
 msgid ""
 "Welcome to the %s demo! You can log in using the username 'admin' and the "
 "password 'admin'."
-msgstr ""
+msgstr "Bienvenue à la démo %s ! Vous pouvez vous connecter en utilisant le nom d'utilisateur «admin» et le mot de passe «admin» ."
 
 #: airtime_mvc/application/views/scripts/partialviews/header.phtml:3
 msgid "Previous:"
@@ -3416,7 +3416,7 @@ msgstr "Votre période d'éssai expire dans"
 #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
 #, php-format
 msgid "Purchase your copy of %s"
-msgstr ""
+msgstr "Achetez votre copie d' %s"
 
 #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
 msgid "My Account"
@@ -3732,7 +3732,7 @@ msgstr "Le contenu des émissions liés doit être programmé avant ou après sa
 
 #: airtime_mvc/application/models/Scheduler.php:195
 msgid "Cannot schedule a playlist that contains missing files."
-msgstr ""
+msgstr "Vous ne pouvez pas programmer une liste de lecture qui contient des fichiers manquants "
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
@@ -3807,7 +3807,7 @@ msgstr "Bonjour %s,  \n\nCliquez sur ce lien pour réinitialiser votre mot de pa
 #: airtime_mvc/application/models/Auth.php:36
 #, php-format
 msgid "%s Password Reset"
-msgstr ""
+msgstr "%s Réinitialisation du mot de passe"
 
 #: airtime_mvc/application/services/CalendarService.php:50
 msgid "Record file doesn't exist"
diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
index 8071b8426..114eb85d3 100644
Binary files a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
index 53eec4c52..4b1c353b4 100644
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/airtime/language/hy_AM/)\n"
 "MIME-Version: 1.0\n"
diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
index 3ea37cd3b..696b207b7 100644
Binary files a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
index b847a5265..d9398df2c 100644
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
-"Last-Translator: Daniel James <daniel@64studio.com>\n"
+"PO-Revision-Date: 2014-11-14 16:45+0000\n"
+"Last-Translator: asantoni_sourcefabric <albert.santoni@sourcefabric.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2737,7 +2737,7 @@ msgstr "Liquidsoapに問題があります。"
 
 #: airtime_mvc/application/configs/navigation.php:12
 msgid "Now Playing"
-msgstr "Now Playing"
+msgstr ""
 
 #: airtime_mvc/application/configs/navigation.php:19
 msgid "Add Media"
diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
index e6fb352ce..1cd4bb1ac 100644
Binary files a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
index d2735f640..6cfc03736 100644
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
 "Last-Translator: Daniel James <daniel@64studio.com>\n"
 "Language-Team: Georgian (http://www.transifex.com/projects/p/airtime/language/ka/)\n"
 "MIME-Version: 1.0\n"
diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
index 032deff0e..abd94d09d 100644
Binary files a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo differ
diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
index 1ebeb7078..84a24f16f 100644
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the Airtime package.
 # 
 # Translators:
+# Felipe Thomaz Pedroni, 2014
 # Pedro Garbellini da Silva <pedrogarbellini@gmail.com>, 2014
 # Sourcefabric <contact@sourcefabric.org>, 2012
 msgid ""
@@ -10,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-13 13:55-0500\n"
-"PO-Revision-Date: 2014-11-14 09:58+0000\n"
-"Last-Translator: Daniel James <daniel@64studio.com>\n"
+"PO-Revision-Date: 2014-12-05 10:32+0000\n"
+"Last-Translator: Felipe Thomaz Pedroni\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 31d2f92ca..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,343 +0,0 @@
-airtime (2.5.1-1) unstable; urgency=low
-
-  * Nightly development snapshot of Airtime 2.5.x series
-
- -- Daniel James <daniel@64studio.com>  Thu, 24 Oct 2013 11:04:56 +0100
-
-airtime (2.5.0-1) unstable; urgency=low
-
-  * Upstream 2.5.0-ga release
-
- -- Daniel James <daniel@64studio.com>  Wed, 23 Oct 2013 14:56:21 +0100
-
-airtime (2.4.1-1) unstable; urgency=low
-
-  * Upstream 2.4.1-ga release
-
- -- Daniel James <daniel@64studio.com>  Wed, 28 Aug 2013 11:53:10 +0100
-
-airtime (2.4.0-1) unstable; urgency=low
-
-  * Upstream 2.4.0-ga release
-
- -- Daniel James <daniel@64studio.com>  Tue, 25 Jun 2013 14:26:55 +0100
-
-airtime (2.3.1-1) unstable; urgency=low
-
-  * Upstream 2.3.1 release
-
- -- Daniel James <daniel@64studio.com>  Wed, 20 Mar 2013 09:43:15 +0000
-
-airtime (2.3.0-2) unstable; urgency=low
-
-  * Don't run the airtime-install script if the user has chosen not to
-    set up Apache
-
- -- Daniel James <daniel@64studio.com>  Tue, 19 Mar 2013 16:39:23 +0000
-
-airtime (2.3.0-1) unstable; urgency=low
-
-  * Upstream 2.3.0 release
-
- -- Daniel James <daniel@64studio.com>  Tue, 12 Feb 2013 11:44:57 +0000
-
-airtime (2.2.1-1) unstable; urgency=low
-
-  * Upstream 2.2.1 release
-
- -- Daniel James <daniel@64studio.com>  Tue, 04 Dec 2012 11:10:37 +0000
-
-airtime (2.2.0-2) unstable; urgency=low
-
-  * Added dependency on flac package for metaflac support
-
- -- Daniel James <daniel@64studio.com>  Mon, 05 Nov 2012 10:54:49 +0000
-
-airtime (2.2.0-1) unstable; urgency=low
-
-  * Upstream 2.2.0 release
-
- -- Daniel James <daniel@64studio.com>  Fri, 26 Oct 2012 10:44:06 +0100
-
-airtime (2.1.3-2) unstable; urgency=low
-
-  * Use a debconf question to set storage directory (CC-3576)
-
- -- Daniel James <daniel@64studio.com>  Tue, 24 Jul 2012 14:55:13 +0100
-
-airtime (2.1.3-1) unstable; urgency=low
-
-  * Upstream 2.1.3 release
-  * Prompt user to answer No to set Icecast passwords manually (CC-4013)
-
- -- Daniel James <daniel@64studio.com>  Thu, 05 Jul 2012 17:01:20 +0100
-
-airtime (2.1.2-1) unstable; urgency=low
-
-  * Upstream 2.1.2 release
-
- -- Daniel James <daniel@64studio.com>  Mon, 18 Jun 2012 10:01:43 +0100
-
-airtime (2.1.1-1) unstable; urgency=low
-
-  * Upstream 2.1.1 release
-
- -- Daniel James <daniel@64studio.com>  Thu, 14 Jun 2012 09:56:38 +0100
-
-airtime (2.1.0-1) unstable; urgency=low
-
-  * Upstream 2.1.0 release
-  * Test the symlink to the Liquidsoap binary
-
- -- Daniel James <daniel@64studio.com>  Mon, 04 June 2012 18:25:11 +0100
-
-airtime (2.0.3-1) unstable; urgency=low
-
-  * Upstream 2.0.3 release
-  * Added Apache license to copyright file
-
- -- Daniel James <daniel@64studio.com>  Wed, 04 Apr 2012 11:11:15 +0100
-
-airtime (2.0.2-1) unstable; urgency=low
-
-  * Upstream 2.0.2 release
-  * Strip install_full scripts from tarball
-
- -- Daniel James <daniel@64studio.com>  Wed, 29 Feb 2012 10:34:35 +0000
-
-airtime (2.0.1-1) unstable; urgency=low
-
-  * Upstream 2.0.1 release
-  * Strip ZFDebug library from tarball
-  * Depend on distro's package of Zend
-
- -- Daniel James <daniel@64studio.com>  Wed, 15 Feb 2012 12:57:23 +0000
-
-airtime (2.0.0-5) unstable; urgency=low
-
-  * Strip phing library from tarball
-
- -- Daniel James <daniel@64studio.com>  Wed, 01 Feb 2012 15:50:18 +0000
-
-airtime (2.0.0-4) unstable; urgency=low
-
-  * Fix for overbooked shows longer than 24 hours
-
- -- Daniel James <daniel@64studio.com>  Wed, 25 Jan 2012 10:11:33 +0000
-
-airtime (2.0.0-3) unstable; urgency=low
-
-  * Upstream 2.0.0 final release
-
- -- Daniel James <daniel@64studio.com>  Fri, 20 Jan 2012 12:03:55 +0000
-
-airtime (2.0.0-2) unstable; urgency=low
-
-  * Upstream 2.0.0-RC1 release
-
- -- Daniel James <daniel@64studio.com>  Mon, 16 Jan 2012 15:41:15 +0000
-
-airtime (2.0.0-1) unstable; urgency=low
-
-  * Upstream 2.0.0-beta2 release
-
- -- Daniel James <daniel@64studio.com>  Thu, 05 Jan 2012 17:15:07 +0000
-
-airtime (1.9.5-3) unstable; urgency=low
-
-  * Upstream 1.9.5-RC5 release
-
- -- Daniel James <daniel@64studio.com>  Mon, 14 Nov 2011 10:34:51 +0000
-
-airtime (1.9.5-2) unstable; urgency=low
-
-  * Upstream 1.9.5-RC2 release
-
- -- Daniel James <daniel@64studio.com>  Wed, 09 Nov 2011 17:09:07 +0000
-
-airtime (1.9.5-1) unstable; urgency=low
-
-  * Upstream 1.9.5-RC1 release
-
- -- Daniel James <daniel@64studio.com>  Mon, 07 Nov 2011 16:16:57 +0000
-
-airtime (1.9.4-13) unstable; urgency=low
-
-  * Increase PHP memory limit to more than post_max_size
-
- -- Daniel James <daniel@64studio.com>  Mon, 03 Oct 2011 17:29:05 +0100
-
-airtime (1.9.4-12) unstable; urgency=low
-
-  * Use invoke-rc.d rather than wwwconfig-common
-
- -- Daniel James <daniel@64studio.com>  Fri, 30 Sep 2011 16:52:28 +0100
-
-airtime (1.9.4-11) unstable; urgency=low
-
-  * Insist on python-virtualenv 1.4.9 or later
-
- -- Daniel James <daniel@64studio.com>  Wed, 28 Sep 2011 14:45:19 +0100
-
-airtime (1.9.4-10) unstable; urgency=low
-
-  * Install python-virtualenv as a Pre-Depends
-
- -- Daniel James <daniel@64studio.com>  Tue, 27 Sep 2011 11:04:29 +0100
-
-airtime (1.9.4-9) unstable; urgency=low
-
-  * Add dependency on ed, configure monit without asking
-
- -- Daniel James <daniel@64studio.com>  Mon, 26 Sep 2011 10:55:09 +0100
-
-airtime (1.9.4-8) unstable; urgency=low
-
-  * Upstream 1.9.4-RC9 release
-
- -- Daniel James <daniel@64studio.com>  Fri, 23 Sep 2011 14:37:15 +0100
-
-airtime (1.9.4-7) unstable; urgency=low
-
-  * Don't depend on Ruby packages
-
- -- Daniel James <daniel@64studio.com>  Thu, 22 Sep 2011 15:51:42 +0100
-
-airtime (1.9.4-6) unstable; urgency=low
-
-  * Upstream 1.9.4-RC8 release
-
- -- Daniel James <daniel@64studio.com>  Wed, 21 Sep 2011 16:22:57 +0100
-
-airtime (1.9.4-5) unstable; urgency=low
-
-  * Upstream 1.9.4-RC7 release
-
- -- Daniel James <daniel@64studio.com>  Tue, 20 Sep 2011 20:12:24 +0100
-
-airtime (1.9.4-4) unstable; urgency=low
-
-  * Upstream 1.9.4-RC6 release
-
- -- Daniel James <daniel@64studio.com>  Tue, 20 Sep 2011 11:48:38 +0100
-
-airtime (1.9.4-3) unstable; urgency=low
-
-  * Upstream 1.9.4-RC3 release
-
- -- Daniel James <daniel@64studio.com>  Thu, 15 Sep 2011 10:28:22 +0100
-
-airtime (1.9.4-2) unstable; urgency=low
-
-  * Upstream 1.9.4-RC2 release
-
- -- Daniel James <daniel@64studio.com>  Wed, 14 Sep 2011 15:18:20 +0100
-
-airtime (1.9.4-1) unstable; urgency=low
-
-  * Upstream 1.9.4-RC1 release
-
- -- Daniel James <daniel@64studio.com>  Tue, 13 Sep 2011 14:50:02 +0100
-
-airtime (1.9.3-4) unstable; urgency=low
-
-  * Improvements to package error logging
-
- -- Daniel James <daniel@64studio.com>  Mon, 05 Sep 2011 16:02:21 +0100
-
-airtime (1.9.3-3) unstable; urgency=low
-
-  * Updated dependency list
-
- -- Daniel James <daniel@64studio.com>  Sat, 03 Sep 2011 11:29:26 +0100
-
-airtime (1.9.3-2) unstable; urgency=low
-
-  * Fixed reconfigure action so that airtime-install does not run again
-
- -- Daniel James <daniel@64studio.com>  Tue, 30 Aug 2011 17:48:49 +0100
-
-airtime (1.9.3-1) unstable; urgency=low
-
-  * upstream 1.9.3
-
- -- Daniel James <daniel@64studio.com>  Sat, 27 Aug 2011 12:58:46 +0100
-
-airtime (1.9.2-2) unstable; urgency=low
-
-  * upstream 1.9.2
-
- -- Daniel James <daniel@64studio.com>  Wed, 24 Aug 2011 12:26:57 +0100
-
-airtime (1.9.2-1) unstable; urgency=low
-
-  * upstream 1.9.2-RC1
-
- -- Daniel James <daniel@64studio.com>  Tue, 23 Aug 2011 15:49:31 +0100
-
-airtime (1.9.1-1) unstable; urgency=low
-
-  * upstream 1.9.1
-
- -- Daniel James <daniel@64studio.com>  Mon, 22 Aug 2011 11:04:33 +0100
-
-airtime (1.9.0-1) unstable; urgency=low
-
-  * upstream 1.9.0
-
- -- Daniel James <daniel@64studio.com>  Fri, 12 Aug 2011 14:11:21 +0100
-
-airtime (1.8.2-4) unstable; urgency=low
-
-  * upstream 1.8.2-RC4
-
- -- Robin Gareus <robin@gareus.org>  Tue, 07 Jun 2011 21:45:55 +0200
-
-airtime (1.8.2-3) unstable; urgency=low
-
-  * upstream 1.8.2-RC3
-
- -- Robin Gareus <robin@gareus.org>  Tue, 07 Jun 2011 02:56:12 +0200
-
-airtime (1.8.2-2) unstable; urgency=low
-
-  * fixed postinst
-
- -- Robin Gareus <robin@gareus.org>  Wed, 01 Jun 2011 20:48:29 +0200
-
-airtime (1.8.2-1) unstable; urgency=low
-
-  * upstream 1.8.2-RC2 release
-
- -- Robin Gareus <robin@gareus.org>  Wed, 01 Jun 2011 16:21:40 +0200
-
-airtime (1.8.1-1) unstable; urgency=low
-
-  * upstream 1.8.1 release
-
- -- Robin Gareus <robin@gareus.org>  Wed, 11 May 2011 22:50:03 +0200
-
-airtime (1.8.0-1) unstable; urgency=low
-
-  * upstream 1.8.0 release
-
- -- Robin Gareus <robin@gareus.org>  Tue, 19 Apr 2011 15:44:40 +0200
-
-airtime (1.7.0-2) unstable; urgency=low
-
-  * fixed few lintian warnings
-  * allow to de-install apache 000default
-
- -- Robin Gareus <robin@gareus.org>  Tue, 05 Apr 2011 20:45:52 +0200
-
-airtime (1.7.0-1) unstable; urgency=low
-
-  * upstream 1.7.0-GA release
-
- -- Robin Gareus <robin@gareus.org>  Mon, 04 Apr 2011 21:19:56 +0200
-
-airtime (1.6.1-1) unstable; urgency=low
-
-  * initial package
-
- -- Robin Gareus <robin@gareus.org>  Sat, 02 Apr 2011 22:48:35 +0200
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/config b/debian/config
deleted file mode 100644
index 553a85fd1..000000000
--- a/debian/config
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Debconf config script for airtime
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input high airtime/apache-setup || true
-db_go ||true
-
-db_get airtime/apache-setup
-if [ "$RET" = "dedicated v-host" ]; then
-	db_input high airtime/apache-servername || true
-	db_go ||true
-	db_input high airtime/apache-serveradmin || true
-	db_go ||true
-	db_input high airtime/apache-deldefault || true
-	db_go ||true
-fi
-
-db_input high airtime/icecast-setup || true
-db_go ||true
-
-db_get airtime/icecast-setup
-if [ "$RET" = "true" ]; then
-        db_input high airtime/icecast-hostname || true
-        db_go ||true
-	db_input high airtime/icecast-sourcepw || true
-	db_go ||true
-	db_input high airtime/icecast-relaypw || true
-	db_go ||true
-	db_input high airtime/icecast-adminpw || true
-	db_go ||true
-fi
-
-# Only ask for storage directory and admin password on clean installs
-if [ ! -e /var/log/airtime/pypo/pypo.log ]; then
-	db_input high airtime/storage-directory || true
-	db_go ||true
-	db_input high airtime/admin-password || true
-	db_go ||true
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 92479d53b..000000000
--- a/debian/control
+++ /dev/null
@@ -1,67 +0,0 @@
-Source: airtime
-Section: web
-Priority: optional
-Maintainer: Daniel James <daniel@64studio.com>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf
-Standards-Version: 3.9.3
-Homepage: http://www.sourcefabric.org/en/airtime/
-
-Package: airtime
-Architecture: all
-Pre-Depends: postgresql, python-virtualenv (>= 1.4.9)
-Depends: apache2,
- coreutils (>= 7.5) | timeout,
- curl,
- ecasound,
- flac,
- gzip (>= 1.3.12),
- libapache2-mod-php5,
- libcamomile-ocaml-data,
- liquidsoap (>= 1.1.1~),
- locales,
- lsof,
- monit,
- mp3gain,
- multitail,
- odbc-postgresql,
- patch,
- php5-cli,
- php5-curl,
- php-db,
- php5-gd,
- php-pear,
- php5-pgsql,
- pwgen,
- python,
- rabbitmq-server,
- silan (>= 0.3.1~),
- sudo,
- sysv-rc, 
- tar (>= 1.22),
- unzip,
- vorbisgain,
- vorbis-tools,
- zendframework | libzend-framework-php,
- ${misc:Depends}
-Recommends: icecast2, php-apc
-Suggests: airtime-audio-samples,
- alsa-utils
-Description: open broadcast software for scheduling and station management.
- Airtime is an open source application that provides remote automation 
- of a broadcast station.
- .
- Major features:
- .
- Web-based remote station management.  Authorized personnel can add
- program material, create playlists, and schedule programming all via 
- a web interface.
- .
- Automation.  Airtime has a scheduler function that enables users to
- set shows with playlists for playback at a date and time of their choosing.
- Playlists can be played back multiple times.
- .
- Solid, fast playback.  Airtime uses the open source Liquidsoap 
- multimedia framework for clean, reliable, fast playback. 
- .
- Open, extensible architecture.  Stations are free to extend and alter 
- all parts of the program code.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 80d81c352..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,156 +0,0 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=200
-Upstream-Name: airtime
-Upstream-Contact: Sourcefabric <airtime-dev@lists.sourcefabric.org>
-Source: http://sourceforge.net/projects/airtime/files/
-
-Files: *
-Copyright:
- 2010-2012 Sourcefabric o.p.s
- 2004-2009 Media Development Loan Fund
-License: GPL-3
-
-Files: airtime/python_apps/pypo/*
-Copyright:
- Jonas Ohrstrom
- Paul Baranowski
- Martin Konecny
-License: GPL-3+
-
-Files: airtime_mvc/library/doctrine/migrations/*
-Copyright: No copyright holders
-License: LGPL-2.1
-Comment:
- This software consists of voluntary contributions made by many individuals
- and is licensed under the LGPL. For more information, see
- <http://www.doctrine-project.org>
-
-Files: airtime_mvc/library/soundcloud-api/*
-Copyright: 2010-2011 Anton Lindqvist <anton@qvister.se>
-License: Expat
-
-Files: airtime_mvc/library/php-amqplib/*
-Copyright:
- Barry Pederson
- Vadim Zaliva
- taavi013@gmail.com
- Sean Murphy
- spiderbill
-License: LGPL-2.1
-
-Files: airtime_mvc/library/propel/*
-Copyright: 2005-2011 Hans Lellelid, David Zuelke, Francois Zaninotto, William Durand
-License: Expat
-
-Files: airtime_mvc/library/propel/test/etc/xsl/*
-Copyright: 2001-2004 The Apache Software Foundation
-License: Apache-2.0
-
-Files: airtime_mvc/public/js/flot/*
-Copyright: 2007-2009 IOLA and Ole Laursen
-License: Expat
-
-Files: debian/*
-Copyright:
- 2012 Alessio Treglia <alessio@debian.org>
- 2011 Robin Gareus <robin@gareus.org>
-License: GPL-2+
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining 
- a copy of this software and associated documentation files (the “Software”), 
- to deal in the Software without restriction, including without limitation the 
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
- sell copies of the Software, and to permit persons to whom the Software is 
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in 
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
- SOFTWARE.
-
-License: GPL-3
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 3 as
- published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-3'.
-
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-3'.
-
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License version 2.1 as published by the Free Software Foundation.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-Comment:
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public
- License can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: Apache-2.0
- Copyright 2001-2004 The Apache Software Foundation
- .
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
-     http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index ccedcc212..000000000
--- a/debian/docs
+++ /dev/null
@@ -1,4 +0,0 @@
-airtime/README
-airtime/CREDITS
-airtime/LICENSE_3RD_PARTY
-airtime/changelog
diff --git a/debian/etc/airtime.ini b/debian/etc/airtime.ini
deleted file mode 100644
index e35f600b0..000000000
--- a/debian/etc/airtime.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[PHP]
-memory_limit = 512M
-magic_quotes_gpc = Off
-file_uploads = On
-upload_tmp_dir = /tmp
diff --git a/debian/etc/apache.conf b/debian/etc/apache.conf
deleted file mode 100644
index d3d84e92c..000000000
--- a/debian/etc/apache.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Alias /airtime /usr/share/airtime/public
-
-SetEnv APPLICATION_ENV "development"
-
-<Directory /usr/share/airtime/public>
-  DirectoryIndex index.php
-	Options -Indexes FollowSymLinks MultiViews
-	AllowOverride All
-	Order allow,deny
-	Allow from all
-</Directory>
diff --git a/debian/etc/apache.vhost.tpl b/debian/etc/apache.vhost.tpl
deleted file mode 100644
index 3d7334107..000000000
--- a/debian/etc/apache.vhost.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<VirtualHost *:80>
-      ServerName __SERVER_NAME__
-      #ServerAlias www.example.com
-
-      ServerAdmin __SERVER_ADMIN__
-
-      DocumentRoot /usr/share/airtime/public
-      DirectoryIndex index.php
-
-      SetEnv APPLICATION_ENV "production"
-
-      <Directory /usr/share/airtime/public>
-              Options -Indexes FollowSymLinks MultiViews
-              AllowOverride All
-              Order allow,deny
-              Allow from all
-      </Directory>
-</VirtualHost> 
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 5474c6080..000000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-sign-tags = True
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 763300c99..000000000
--- a/debian/install
+++ /dev/null
@@ -1,17 +0,0 @@
-airtime/airtime_mvc var/lib/airtime/tmp/
-airtime/install_minimal var/lib/airtime/tmp/
-airtime/python_apps var/lib/airtime/tmp/
-airtime/utils var/lib/airtime/tmp/
-
-airtime/widgets usr/share/doc/airtime/examples/
-
-debian/etc/apache.conf /etc/airtime/
-debian/etc/airtime.ini /etc/airtime/
-debian/etc/apache.vhost.tpl /etc/airtime/
-
-debian/usr/bin/airtime-launch-browser /usr/bin/
-debian/usr/share/applications/airtime.desktop /usr/share/applications/
-debian/usr/share/man/man1 /usr/share/man/
-debian/usr/share/menu/airtime /usr/share/menu
-debian/usr/share/pixmaps/airtime.xpm /usr/share/pixmaps/
-
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
deleted file mode 100644
index cef83a340..000000000
--- a/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
deleted file mode 100644
index 6458b85ac..000000000
--- a/debian/po/templates.pot
+++ /dev/null
@@ -1,249 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: airtime@packages.debian.org\n"
-"POT-Creation-Date: 2012-07-05 16:49+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "dedicated v-host"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:1001
-msgid "no thanks"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid "Create apache2 config:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid ""
-"This setup script can perform Apache web server configuration so that you "
-"can connect to Airtime directly after this installation."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid ""
-"Production systems should choose \"dedicated v-host\". This option will ask "
-"for a server hostname (FQDN) and will create a minimal Apache virtual host "
-"configuration that you can adapt."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:1002
-msgid ""
-"\"no, thanks\": no problem. You're welcome to set it up however you like. "
-"Note that the files in /etc/airtime/ may come in handy doing so."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:2001
-msgid "remove default"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:2001
-msgid "no change"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid "Remove 000-default apache config:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid ""
-"By default the Apache webserver is configured to send all virtual hosts to "
-"the /var/www/ directory."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../templates:2002
-msgid ""
-"This option will invoke `sudo a2dissite default` and is recommended when "
-"using a virtual host for Airtime."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid "FQDN - Apache virtual host ServerName:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid ""
-"Enter the main hostname of the web server. The DNS of this name must resolve "
-"to the Apache server running on this machine."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid "e.g. \"example.com\" or \"www.example.com\" (without the quotes)"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3001
-msgid ""
-"You can customize /etc/apache2/sites-enabled/airtime.vhost afterward and add "
-"ServerAliases and further custom configuration."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "Email of the ServerAdmin:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:4001
-msgid "An email address is required for the virtual host configuration."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid "Enable Icecast2 and set passwords automatically?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"This option enables a local Icecast streaming media server to start on boot, "
-"and configures passwords for both the Icecast server and Airtime."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"Note: these settings are here for convenience only. Strictly speaking they "
-"should be done during Icecast installation - not Airtime installation."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:5001
-msgid ""
-"If you wish to set Icecast server passwords manually, you should answer No "
-"here."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid "Icecast2 hostname:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:6001
-msgid ""
-"Specify the hostname of the Icecast server. Depending on your setup, this "
-"might be the same as the Airtime ServerName. For testing purposes, you can "
-"use the default of 'localhost'."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid "Icecast2 Source Password:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:7001
-msgid "Specify a password to send A/V sources to Icecast"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:8001
-msgid "Icecast2 Relay Password:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:8001
-msgid ""
-"Specify a password for stream relay access. This is not needed by Airtime, "
-"however you should change it from the default to lock down your system."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:9001
-msgid "Icecast2 Admin Password:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:9001
-msgid ""
-"Specify the admin password for Icecast.  You can access icecast2's admin "
-"interface via http://localhost:8000/ - and both monitor connection as well "
-"as block users."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:10001
-msgid "Airtime Admin Password:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:10001
-msgid ""
-"Specify a secure admin password for Airtime. You can access the Airtime "
-"administration interface at http://localhost/ to set up other user accounts, "
-"upload media, create playlists and schedule shows."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:11001
-msgid "Airtime Storage Directory:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:11001
-msgid ""
-"Specify the main storage path which Airtime will use, ending with a slash. "
-"You can also specify watched folders in the Airtime administration interface."
-msgstr ""
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index f57c972de..000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/bin/bash
-#postinst script for airtime
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ "$DPKG_DEBUG" = "developer" ]; then
-    set -x
-fi
-
-wwwdir="/usr/share/airtime"
-tmpdir="/var/lib/airtime/tmp"
-configdir="/etc/airtime"
-includefile="${configdir}/apache.conf"
-a2tplfile="${configdir}/apache.vhost.tpl"
-phpinifile="${configdir}/airtime.ini"
-OLDVERSION="$2"
-NEWVERSION="2.5.1"
-
-case "$1" in
-  configure|reconfigure)
-
-    webserver="apache2"
-    php="php5"
-
-    # this file in 1.8.2 is a directory path in 1.9.3
-    if [ -f /var/www/airtime/utils/airtime-import ]; then
-      rm -f /var/www/airtime/utils/airtime-import
-    fi
-
-    # do we set up a virtual host?
-    db_get airtime/apache-setup
-    APACHESETUP=$RET
-    if [ "${APACHESETUP}" == "no thanks" ]; then
-    echo "Not setting up ${webserver} and ${php}..."
-
-     elif [ "${APACHESETUP}" == "dedicated v-host" ]; then
-     echo "Setting up ${webserver}..."
-
-      # create the document root if it doesn't exist
-      if [ ! -d $wwwdir/public/ ]; then
-        install -d -m755 $wwwdir/public/
-      fi
-
-      # temporarily disable an existing virtual host
-      if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
-        a2dissite airtime-vhost
-      elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
-        a2dissite airtime-vhost.conf
-      fi
-
-      db_get airtime/apache-servername
-      SN=$RET
-      db_get airtime/apache-serveradmin
-      SA=$RET
-
-      if [ ! -d /etc/$webserver/sites-available/ ]; then
-        install -d -m755 /etc/$webserver/sites-available/
-      fi
-      sed -e "s/__SERVER_ADMIN__/${SA}/;s/__SERVER_NAME__/${SN}/" \
-        ${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf
-
-      command -v a2ensite > /dev/null
-      RETVAL=$?
-      if [ $RETVAL -eq 0 ]; then
-        a2ensite airtime-vhost.conf
-      fi
-
-      # insert a specific hostname, if provided, into API configuration
-      if [ "${SN}" != "localhost" ]; then
-
-        # new installs
-        if [ -f /var/lib/airtime/tmp/airtime_mvc/build/airtime.conf -a -f /var/lib/airtime/tmp/python_apps/api_clients/api_client.cfg ]; then
-        sed -i "s/base_url = localhost/base_url = ${SN}/" /var/lib/airtime/tmp/airtime_mvc/build/airtime.conf
-        sed -i "s/host = 'localhost'/host = '${SN}'/" /var/lib/airtime/tmp/python_apps/api_clients/api_client.cfg
-        fi
-
-        # upgrades
-        if [ -f /etc/airtime/airtime.conf -a -f /etc/airtime/api_client.cfg ]; then
-        sed -i "s/base_url = localhost/base_url = ${SN}/" /etc/airtime/airtime.conf
-        sed -i "s/host = 'localhost'/host = '${SN}'/" /etc/airtime/api_client.cfg
-        fi
-      fi
-
-      # enable the rewrite module
-      command -v a2enmod > /dev/null
-      RETVAL=$?
-      if [ $RETVAL -eq 0 ]; then
-        a2enmod rewrite
-      fi
-
-      # remove the default site, if requested to
-      db_get airtime/apache-deldefault
-      if [ "$RET" == "remove default" ]; then
-        if [ -f /etc/apache2/sites-available/default ]; then
-          a2dissite default
-        elif [ -f /etc/apache2/sites-available/000-default.conf ]; then
-          a2dissite 000-default.conf
-        fi
-      fi
-
-      # PHP config
-      echo "Configuring php5..."
-      if [ ! -d /etc/$php/conf.d/ ]; then
-        install -d -m755 /etc/$php/conf.d/
-      fi
-      if [ ! -e /etc/$php/conf.d/airtime.ini ]; then
-        ln -s ${phpinifile} /etc/$php/conf.d/airtime.ini
-      fi
-
-      # restart apache
-      invoke-rc.d apache2 restart
-    fi
-
-    # XXX ICECAST XXX
-    db_get airtime/icecast-setup
-    if [ "$RET" == "true" ]; then
-      if [ -f /etc/default/icecast2 -a -f /etc/icecast2/icecast.xml ]; then
-        echo "Setting up icecast2..."
-        sed -i "s:ENABLE=.*:ENABLE=true:g" /etc/default/icecast2
-        db_get airtime/icecast-sourcepw
-        ICESOURCE=$RET
-        sed -i "s:<source-password>.*<\/source-password>:<source-password>$ICESOURCE<\/source-password>:g" /etc/icecast2/icecast.xml
-        db_get airtime/icecast-relaypw
-        ICERELAY=$RET
-        sed -i "s:<relay-password>.*<\/relay-password>:<relay-password>$ICERELAY<\/relay-password>:g" /etc/icecast2/icecast.xml
-        db_get airtime/icecast-adminpw
-        ICEADMIN=$RET
-        sed -i "s:<admin-password>.*<\/admin-password>:<admin-password>$ICEADMIN<\/admin-password>:g" /etc/icecast2/icecast.xml
-        db_get airtime/icecast-hostname
-        ICEHOST=$RET
-        sed -i "s:<hostname>.*<\/hostname>:<hostname>$ICEHOST<\/hostname>:g" /etc/icecast2/icecast.xml
-
-        # restart icecast server
-        invoke-rc.d icecast2 restart || true
-
-          # save icecast hostname and source-password in airtime
-          db_get airtime/icecast-hostname
-          ICEHOST=$RET
-          sed -i "s:'s1_host', '127.0.0.1', 'string':'s1_host', '$ICEHOST', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
-
-          db_get airtime/icecast-sourcepw
-          ICESOURCE=$RET
-          sed -i "s:'s1_pass', 'hackme', 'string':'s1_pass', '$ICESOURCE', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
-
-          db_get airtime/icecast-adminpw
-          ICEADMIN=$RET
-          sed -i "s:'s1_admin_user', '', 'string':'s1_admin_user', 'admin', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
-          sed -i "s:'s1_admin_pass', '', 'string':'s1_admin_pass', '$ICEADMIN', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
-
-      else
-        echo "The icecast2 package does not appear to be installed on this server."
-      fi
-    fi
-
-    # Monit setup
-      if [ -f /etc/default/monit ]; then
-        echo "Setting up monit configuration..."
-         sed -i 's:startup=.*:startup=1:g' /etc/default/monit
-         sed -i 's:START=.*:START=yes:g' /etc/default/monit
-
-           MONITCONFIGURED=$(grep "include /etc/monit/conf.d" /etc/monit/monitrc || true)
-           if [ -z "$MONITCONFIGURED" ]; then
-            echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc
-           fi
-
-            invoke-rc.d monit restart
-      else
-        echo "The monit package does not appear to be installed on this server."
-      fi
-
-     # get airtime admin password on new installs
-	if [ ! -e /var/log/airtime/pypo/pypo.log ]; then
-     		db_get airtime/admin-password
-     		AIRTIMEADMIN=$RET
-     		sed -i "1s:md5('admin'):md5('$AIRTIMEADMIN'):g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
-	fi
-
-    # get the main storage directory specified by the user
-    db_get airtime/storage-directory
-     AIRTIMESTORAGE=$RET
-      if [ "$AIRTIMESTORAGE" != "/srv/airtime/stor/" ]; then
-       sed -i "1s:/srv/airtime/stor/:$AIRTIMESTORAGE:g" ${tmpdir}/install_minimal/include/airtime-install.ini
-      fi
-
-    # stop debconf so daemons started by the install script cannot hold open the pipe
-    db_stop
-
-    # start rabbitmq if it isn't running
-    if [ -f /etc/init.d/rabbitmq-server ]; then
-      RABBITMQSTOPPED=$(invoke-rc.d rabbitmq-server status | grep no_nodes_running || true)
-        if [ -n "$RABBITMQSTOPPED" ]; then
-           invoke-rc.d rabbitmq-server start
-        fi
-
-        # Warn if rabbitmq is installed but not set to start on boot
-        RABBITMQSTARTONBOOT=$(ls /etc/rc2.d/ | grep rabbitmq || true)
-          if [ -z "$RABBITMQSTARTONBOOT" ]; then
-            echo "Warning: rabbitmq-server is not configured to start after a reboot!"
-            echo "Fix Default-Start and Default-Stop lines in /etc/init.d/rabbitmq-server"
-            echo "then run this command as root: update-rc.d rabbitmq-server defaults"
-          fi
-    else
-     echo "The rabbitmq-server package does not appear to be installed on this server."
-    fi
-
-    # fix the Liquidsoap symlink if it doesn't point to standard location
-    if [ -h /usr/bin/airtime-liquidsoap ]; then
-      SYMLINK_TARGET=`readlink /usr/bin/airtime-liquidsoap`
-       if [ "$SYMLINK_TARGET" != "/usr/bin/liquidsoap" ]; then
-        echo "Liquidsoap symlink points to the wrong place, fixing it!"
-         rm /usr/bin/airtime-liquidsoap
-          ln -s /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
-       fi
-
-       if [ "$SYMLINK_TARGET" == "/usr/bin/liquidsoap" ]; then
-        echo "Liquidsoap symlink points to the right place!"
-       fi
-    fi
-
-    # symlink the Liquidsoap path to standard location, if symlink doesn't exist
-    if [ ! -h /usr/bin/airtime-liquidsoap ]; then
-     echo "Creating symlink for Liquidsoap..."
-      ln -s /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap
-    fi
-
-    # don't run airtime-install if the user is doing a dpkg-reconfigure
-    if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
-      echo "Reconfiguration complete."
-    else
-
-      if [ -n "$OLDVERSION" ] && [[ "${OLDVERSION:0:3}" < "2.1" ]]; then
-        echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
-
-      elif [ "${APACHESETUP}" == "no thanks" ]; then
-        echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
-
-      else
-
-        mkdir -p /var/log/airtime
-        cd $tmpdir/install_minimal/
-
-        if [ "${OLDVERSION:0:5}" == "${NEWVERSION}" ] ; then
-          echo "Reinstallation detected..."
-          echo | ./airtime-install --disable-deb-check -rp 2> /var/log/airtime/reinstallation-errors.log
-        else
-
-          ./airtime-install --disable-deb-check 2> /var/log/airtime/installation-errors.log
-
-        fi
-
-          # Update the desktop menu to show Airtime
-          if test -x /usr/bin/update-menus; then
-            update-menus;
-          fi
-      fi
-    fi
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-
-  ;;
-
-  *)
-       echo "postinst called with unknown argument \`$1'" >&2
-       exit 1
-  ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100755
index ed1680c58..000000000
--- a/debian/postrm
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-#postrm script for airtime
-
-set -e
-
-if [ -f /usr/share/debconf/confmodule ]; then
-  . /usr/share/debconf/confmodule
-fi
-
-if [ "$DPKG_DEBUG" = "developer" ]; then
-    set -x
-fi
-
-package_name="airtime"
-datadir="/srv/airtime"
-wwwdir="/usr/share/airtime"
-tmpdir="/var/lib/airtime/tmp"
-configdir="/etc/airtime"
-
-webserver="apache2"
-php="php5"
-
-case "$1" in
-  purge|remove)
-
-                # airtime uninstaller does not remove these
-
-		if [ -L /var/lib/airtime/airtime_mvc ]; then
-			rm -rf /var/lib/airtime/ || true
-		fi
-
-                if [ -f /var/lib/airtime/.htaccess ]; then
-                        rm -f /var/lib/airtime/.htaccess || true
-                fi
-
-		if [ -f ${tmpdir}/install_minimal/distribute-0.6.10.tar.gz ]; then
-			rm -f ${tmpdir}/install_minimal/distribute-0.6.10.tar.gz || true
-		fi
-
-                if [ -f /usr/share/python-virtualenv/distribute-0.6.10.tar.gz ]; then
-                        rm -f /usr/share/python-virtualenv/distribute-0.6.10.tar.gz || true
-                fi
-
-                if [ -d ${tmpdir}/python_apps/pypo/liquidsoap_bin ]; then
-                        rm -f ${tmpdir}/python_apps/pypo/liquidsoap_bin/* || true
-			rm -rf ${tmpdir}/python_apps/pypo/liquidsoap_bin || true
-		fi
-
-                if [ -d /var/lib/airtime/python_apps/pypo/liquidsoap ]; then
-                        rm -rf /var/lib/airtime/python_apps/pypo/liquidsoap || true
-                fi
-
-                if [ -d ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor ]; then
-                        rm -rf ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor || true
-                fi
-
-                if [ -f ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/storDump.txt ]; then
-                        rm -f ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/storDump.txt || true
-                fi
-
-                if [ -L /usr/bin/airtime-clean-storage ]; then
-                        rm -f /usr/bin/airtime-clean-storage || true
-                fi
-
-                if [ -L /usr/bin/airtime-user ]; then
-                        rm -f /usr/bin/airtime-user || true
-                fi
-
-                if [ -L /usr/bin/airtime-log ]; then
-                        rm -f /usr/bin/airtime-log || true
-                fi
-
-    # Un-configure webservers
-    if [ -L /etc/$webserver/conf.d/airtime.conf ]; then
-      rm -f /etc/$webserver/conf.d/airtime.conf || true
-      restart="$webserver $restart"
-    fi
-
-    if [ -L /etc/$php/conf.d/airtime.ini ]; then
-      rm -f /etc/$php/conf.d/airtime.ini || true
-      restart="$webserver $restart"
-    fi
-
-    if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then
-      a2dissite airtime-vhost &>/dev/null || true
-    elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then
-      a2dissite airtime-vhost.conf &>/dev/null || true
-      # TODO: if airtime-vhost is not modified -> delete it
-      restart="$webserver $restart"
-    fi
-
-    servers="apache2"
-    # may not exist if package was manually installed
-    if [ -r /usr/share/wwwconfig-common/restart.sh ]; then
-      . /usr/share/wwwconfig-common/restart.sh || true
-      echo $error
-    fi
-
-    # Remove Airtime menu entry and icon
-    if test -x /usr/bin/update-menus; then
-      update-menus;
-    fi
-
-    # Remove legacy permission overrides
-    dpkg-statoverride --list $datadir &>/dev/null && \
-    dpkg-statoverride --remove $datadir || true
-
-    # Only remove settings if purge is called as an argument
-    if [ "$1" = "purge" ]; then
-                        echo "Removing configuration files from /etc/airtime/" >&2
-			rm -rf /etc/airtime || true
-                        echo "Purging Airtime settings from debconf database" >&2
-                        db_purge || true
-    fi
-
-  ;;
-
-  upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-  ;;
-
-  *)
-      echo "postrm called with unknown argument \`$1'" >&2
-      exit 1
-  ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/preinst b/debian/preinst
deleted file mode 100755
index 02b762856..000000000
--- a/debian/preinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-#preinst script for airtime
-
-set -e
-
-if [ "$DPKG_DEBUG" = "developer" ]; then
-    set -x
-fi
-
-case "$1" in
-  install|upgrade)
-
-    # Remove liquidsoap binary from old installs
-    if [ -f /var/lib/airtime/python_apps/pypo/liquidsoap/liquidsoap ]; then
-     echo "Removing old Liquidsoap binary..." >&2
-     rm -f /var/lib/airtime/python_apps/pypo/liquidsoap/liquidsoap
-    fi
-
-  ;;
-
-  abort-upgrade)
-    echo "Upgrade aborting..." >&2
-  ;;
-
-  *)
-       echo "preinst called with unknown argument \`$1'" >&2
-       exit 1
-  ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 3cf5a91b6..000000000
--- a/debian/prerm
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#prerm script for airtime
-
-set -e
-
-package_name="airtime"
-datadir="/var/lib/${package_name}/tmp"
-
-case "$1" in
-  remove|purge)
-      cd $datadir/install_minimal/ && ./airtime-uninstall || true
-  ;;
-
-  upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-  ;;
-
-  *)
-      echo "prerm called with unknown argument \`$1'" >&2
-      exit 1
-  ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index d91c2d9f2..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/make -f
-
-#override_dh_shlibdeps:
-#	dh_makeshlibs
-#	-dh_shlibdeps -- --ignore-missing-info
-
-%:
-	dh $@
-
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index cc43edcc4..000000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/usr/share/man/man1/airtime-import.1.gz
-debian/usr/share/man/man1/airtime-launch-browser.1.gz
-debian/usr/share/man/man1/airtime-log.1.gz
-debian/usr/share/man/man1/airtime-test-soundcard.1.gz
-debian/usr/share/man/man1/airtime-test-stream.1.gz
diff --git a/debian/templates b/debian/templates
deleted file mode 100644
index 4cd301493..000000000
--- a/debian/templates
+++ /dev/null
@@ -1,109 +0,0 @@
-Template: airtime/apache-setup
-Type: select
-__Choices: dedicated v-host, no thanks
-Choices-de.UTF-8: v-host einrichten, nein danke
-Default: dedicated v-host
-_Description: Create apache2 config:
- This setup script can perform Apache web server configuration
- so that you can connect to Airtime directly after this installation.
- .
- Production systems should choose "dedicated v-host". This option
- will ask for a server hostname (FQDN) and will create a minimal Apache
- virtual host configuration that you can adapt.
- .
- "no, thanks": no problem. You're welcome to set it up however you like.
- Note that the files in /etc/airtime/ may come in handy doing so.
-Description-de.UTF-8: Erzeugen einer apache2 konfiuration:
- .
-
-Template: airtime/apache-deldefault
-Type: select
-__Choices: remove default, no change
-Default: no change
-_Description: Remove 000-default apache config:
- By default the Apache webserver is configured to send all virtual hosts
- to the /var/www/ directory.
- .
- This option will invoke `sudo a2dissite default` and is recommended
- when using a virtual host for Airtime.
-
-Template: airtime/apache-servername
-Type: string
-Default: localhost
-_Description: FQDN - Apache virtual host ServerName:
- Enter the main hostname of the web server.
- The DNS of this name must resolve to the Apache server running on this
- machine.
- .
- e.g. "example.com" or "www.example.com" (without the quotes)
- .
- You can customize /etc/apache2/sites-enabled/airtime.vhost afterward
- and add ServerAliases and further custom configuration.
-
-Template: airtime/apache-serveradmin
-Type: string
-Default: root@localhost
-_Description: Email of the ServerAdmin:
- An email address is required for the virtual host configuration.
-
-Template: airtime/icecast-setup
-Type: boolean
-Default: false
-_Description: Enable Icecast2 and set passwords automatically?
- This option enables a local Icecast streaming media server to start
- on boot, and configures passwords for both the Icecast server and Airtime.
- .
- Note: these settings are here for convenience only. Strictly speaking
- they should be done during Icecast installation - not Airtime installation.
- .
- If you wish to set Icecast server passwords manually,
- you should answer No here.
-
-Template: airtime/icecast-hostname
-Type: string
-Default: localhost
-_Description: Icecast2 hostname:
- Specify the hostname of the Icecast server. Depending on your
- setup, this might be the same as the Airtime ServerName. For
- testing purposes, you can use the default of 'localhost'.
-
-Template: airtime/icecast-sourcepw
-Type: string
-Default: hackme
-_Description: Icecast2 Source Password:
- Specify a password to send A/V sources to Icecast
-
-Template: airtime/icecast-relaypw
-Type: string
-Default: hackme
-_Description: Icecast2 Relay Password:
- Specify a password for stream relay access.
- This is not needed by Airtime, however you should
- change it from the default to lock down your system.
-
-Template: airtime/icecast-adminpw
-Type: string
-Default: hackme
-_Description: Icecast2 Admin Password:
- Specify the admin password for Icecast. 
- You can access icecast2's admin interface via
- http://localhost:8000/ - and both monitor connection as
- well as block users.
-
-Template: airtime/admin-password
-Type: string
-Default: admin
-_Description: Airtime Admin Password:
- Specify a secure admin password for Airtime.
- You can access the Airtime administration interface
- at http://localhost/ to set up other user accounts,
- upload media, create playlists and schedule shows.
-
-Template: airtime/storage-directory
-Type: string
-Default: /srv/airtime/stor/
-_Description: Airtime Storage Directory:
- Specify the main storage path which Airtime will use,
- ending with a slash.
- You can also specify watched folders in the Airtime
- administration interface.
diff --git a/debian/usr/bin/airtime-launch-browser b/debian/usr/bin/airtime-launch-browser
deleted file mode 100755
index c0bf585c0..000000000
--- a/debian/usr/bin/airtime-launch-browser
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#-------------------------------------------------------------------------------
-#   Copyright (c) 2012 Sourcefabric O.P.S.
-#
-#   This file is part of the Airtime project.
-#   http://airtime.sourcefabric.org/
-#
-#   Airtime is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   Airtime is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with Airtime; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#-------------------------------------------------------------------------------
-#-------------------------------------------------------------------------------
-#  This script opens the default graphical web browser on the Airtime login page.
-
-/usr/bin/x-www-browser http://localhost/ || exit 1
diff --git a/debian/usr/share/applications/airtime.desktop b/debian/usr/share/applications/airtime.desktop
deleted file mode 100644
index e712670ee..000000000
--- a/debian/usr/share/applications/airtime.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Airtime
-GenericName=Broadcast automation system
-Icon=/usr/share/pixmaps/airtime.xpm
-Exec=/usr/bin/airtime-launch-browser
-Categories=AudioVideo;Audio;
diff --git a/debian/usr/share/man/man1/airtime-import.1.gz b/debian/usr/share/man/man1/airtime-import.1.gz
deleted file mode 100644
index 828d8cf66..000000000
Binary files a/debian/usr/share/man/man1/airtime-import.1.gz and /dev/null differ
diff --git a/debian/usr/share/man/man1/airtime-launch-browser.1.gz b/debian/usr/share/man/man1/airtime-launch-browser.1.gz
deleted file mode 100644
index e9e211c0d..000000000
Binary files a/debian/usr/share/man/man1/airtime-launch-browser.1.gz and /dev/null differ
diff --git a/debian/usr/share/man/man1/airtime-log.1.gz b/debian/usr/share/man/man1/airtime-log.1.gz
deleted file mode 100644
index c6e47d873..000000000
Binary files a/debian/usr/share/man/man1/airtime-log.1.gz and /dev/null differ
diff --git a/debian/usr/share/man/man1/airtime-test-soundcard.1.gz b/debian/usr/share/man/man1/airtime-test-soundcard.1.gz
deleted file mode 100644
index 6d915473d..000000000
Binary files a/debian/usr/share/man/man1/airtime-test-soundcard.1.gz and /dev/null differ
diff --git a/debian/usr/share/man/man1/airtime-test-stream.1.gz b/debian/usr/share/man/man1/airtime-test-stream.1.gz
deleted file mode 100644
index c6660fd4d..000000000
Binary files a/debian/usr/share/man/man1/airtime-test-stream.1.gz and /dev/null differ
diff --git a/debian/usr/share/menu/airtime b/debian/usr/share/menu/airtime
deleted file mode 100644
index d9db710dc..000000000
--- a/debian/usr/share/menu/airtime
+++ /dev/null
@@ -1,6 +0,0 @@
-?package(airtime):\
-  needs="X11"\
-  section="Applications/Sound"\
-  title="Airtime"\
-  command="/usr/bin/airtime-launch-browser"\
-  icon="/usr/share/pixmaps/airtime.xpm"
diff --git a/debian/usr/share/pixmaps/airtime.xpm b/debian/usr/share/pixmaps/airtime.xpm
deleted file mode 100644
index 95c8ab39c..000000000
--- a/debian/usr/share/pixmaps/airtime.xpm
+++ /dev/null
@@ -1,50 +0,0 @@
-/* XPM */
-static char * airtime_xpm[] = {
-"32 32 15 1",
-" 	c None",
-".	c #FFE1D5",
-"+	c #FFA47F",
-"@	c #FF7137",
-"#	c #FF5D1A",
-"$	c #FF7B45",
-"%	c #FFB89B",
-"&	c #FF9062",
-"*	c #FFCDB8",
-"=	c #FF6728",
-"-	c #FFC3AA",
-";	c #FF9A70",
-">	c #FFD7C6",
-",	c #FF8653",
-"'	c #FFAE8D",
-"              .+@+.             ",
-"           .+@#####$%           ",
-"        .+@###########&*        ",
-"      %$################=+      ",
-"    $######################$-   ",
-"     %$#######################;.",
-"       .+=#####################>",
-"          *&##################, ",
-"             %@###############> ",
-"               .;=###########,  ",
-"                  -@#########>  ",
-"                   =########,   ",
-"                  -#########>   ",
-"                  ,########$    ",
-"                  #########-    ",
-"                 %########@     ",
-"                 @########-     ",
-"                .########@      ",
-"                ;########-      ",
-"                =#######@       ",
-"               -#######,.       ",
-"               &#####@*         ",
-"               ####='           ",
-"              %###;             ",
-"              $#,.              ",
-"             .@-                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 0bc1b4aa8..000000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/airtime/airtime-([\d\.]+)-ga\.tar\.gz
diff --git a/gen-snapshot.sh b/gen-snapshot.sh
deleted file mode 100755
index bb96ddd53..000000000
--- a/gen-snapshot.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#/bin/sh
-# Script for generating nightly Airtime snapshot packages
-# Run from the directory containg the files checked out from git
-
-VERSION=2.5.1~$(date "+%Y%m%d")
-BUILDDEST=/tmp/airtime-${VERSION}/
-DEBDIR=`pwd`/debian
-
-git checkout $(git branch | grep "^*" | cut -d' ' -f 2)
-git pull
-
-echo "cleaning up previous build..."
-
-rm -rf /tmp/airtime*
-mkdir -p ${BUILDDEST}airtime
-
-echo "copying files to temporary directory..."
-
-cp -a * ${BUILDDEST}airtime || exit
-cp -a $DEBDIR ${BUILDDEST}debian || exit
-
-cd ${BUILDDEST} || exit
-
-# Set the version of the snapshot package
-
-sed -i "1s:(2.5.1-1):(${VERSION}):g" debian/changelog
-
-# FIXES for 2.5.1 #############
-
-# these are all moved to debian/copyright
-rm airtime/python_apps/pypo/LICENSE
-rm airtime/airtime_mvc/library/php-amqplib/LICENSE
-rm airtime/airtime_mvc/library/phing/LICENSE
-rm airtime/airtime_mvc/library/propel/LICENSE
-rm airtime/airtime_mvc/library/soundcloud-api/README.md
-
-# Remove Liquidsoap binary
-rm -r airtime/python_apps/pypo/liquidsoap_bin/
-
-#Remove phing library
-rm -r airtime/airtime_mvc/library/phing/
-
-#Remove ZFDebug
-rm -r airtime/airtime_mvc/library/ZFDebug/
-
-#Strip un-needed install scripts
-rm -r airtime/install_full/
-
-#Remove dev tools and files
-rm -r airtime/dev_tools/
-rm -r airtime/docs/
-rm airtime/.gitignore
-rm airtime/.zfproject.xml
-
-#############################
-
-echo "running the build..."
-
-debuild -b -uc -us $@ || exit
-
-cp /tmp/airtime_${VERSION}* /var/www/apt/snapshots/
diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq
index 36082c6fd..3ad6f6c55 100644
--- a/python_apps/pypo/liquidsoap_scripts/opus.liq
+++ b/python_apps/pypo/liquidsoap_scripts/opus.liq
@@ -1,68 +1,68 @@
             if bitrate == 24 then 
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 24, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 24, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 24, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 24, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 32 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 32, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 32, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 32, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 32, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 48 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 48, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 48, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 48, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 48, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 64 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 64, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 64, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 64, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 64, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 96 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 96, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 96, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 96, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 96, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 128 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 128, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 128, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 128, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 128, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 160 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 160, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 160, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 160, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 160, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 192 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 192, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 192, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 192, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 192, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 224 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 224, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 224, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 224, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 224, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 256 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 256, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 256, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 256, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 256, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             elsif bitrate == 320 then
                 if stereo then
-                    ignore(output_stereo(%opus(bitrate = 320, channels = 2), !source))
+                    ignore(output_stereo(%opus(bitrate = 320, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source))
                 else
-                    ignore(output_mono(%opus(bitrate = 320, channels = 1), mean(!source)))
+                    ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source)))
                 end
             end
 
diff --git a/tests/selenium/Calendar Add Show Skeleton.html b/tests/selenium/Calendar Add Show Skeleton.html
index 6ab57a89e..c369c304b 100644
--- a/tests/selenium/Calendar Add Show Skeleton.html	
+++ b/tests/selenium/Calendar Add Show Skeleton.html	
@@ -21,6 +21,11 @@
 	<td>link=Calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>css=table.fc-header.0.0</td>
+	<td>todayShow</td>
+</tr>
 <tr>
 	<td>click</td>
 	<td>link=Show</td>
@@ -136,7 +141,6 @@
 	<td>id=add_show_color</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/tests/selenium/Calendar Skeleton Present.html b/tests/selenium/Calendar Skeleton Present.html
index 6aeb2f102..994200394 100644
--- a/tests/selenium/Calendar Skeleton Present.html	
+++ b/tests/selenium/Calendar Skeleton Present.html	
@@ -16,16 +16,31 @@
 	<td>/Library</td>
 	<td></td>
 </tr>
+<tr>
+	<td>selectWindow</td>
+	<td>null</td>
+	<td></td>
+</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>link=Calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>id=schedule_block_table.0.1</td>
+	<td>todayShowNovember 2014dayweekmonthSunMonTueWedThuFriSat26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />31<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />7<br /> <br /><br /><br />8<br /> <br /><br /><br />9<br /> <br /><br /><br />10<br /> <br /><br /><br />11<br /> <br /><br /><br />12<br /> <br /><br /><br />13<br /> <br /><br /><br />14<br /> <br /><br /><br />15<br /> <br /><br /><br />16<br /> <br /><br /><br />17<br /> <br /><br /><br />18<br /> <br /><br /><br />19<br /> <br /><br /><br />20<br /> <br /><br /><br />21<br /> <br /><br /><br />22<br /> <br /><br /><br />23<br /> <br /><br /><br />24<br /> <br /><br /><br />25<br /> <br /><br /><br />26<br /> <br /><br /><br />27<br /> <br /><br /><br />28<br /> <br /><br /><br />29<br /> <br /><br /><br />30<br /> <br /><br /><br />1<br /> <br /><br /><br />2<br /> <br /><br /><br />3<br /> <br /><br /><br />4<br /> <br /><br /><br />5<br /> <br /><br /><br />6<br /> <br /><br /><br />11:00 - 15:00Weekend Morning Blues<br /><br />11:00 - 12:00naregggg<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 18:00TestNareg<br /><br />11:50 - 12:55nareg51<br /><br />11:00 - 18:00TestNareg<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />13:45 - 16:55nareg55<br /><br />13:45 - 14:57nareg55<br /><br />15:00 - 15:07nareg88<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />12:10 - 14:30nareg4<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br /><br />22:01 - 23:00Untitled Show<br /><br />23:00 - 0:00Untitled Show<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />11:00 - 16:00Weekend Morning Blues<br />&nbsp;&nbsp;&nbsp;<br /><br />12:10 - 14:30nareg4<br />&nbsp;&nbsp;&nbsp;<br /><br />15:00 - 19:00nareg5</td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>id=schedule_calendar</td>
 	<td></td>
 </tr>
+<tr>
+	<td>waitForTable</td>
+	<td>css=table.fc-header.0.2</td>
+	<td>dayweekmonth</td>
+</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span[3]/span/span</td>
@@ -46,7 +61,6 @@
 	<td>//div[@id='schedule_calendar']/table/tbody/tr/td[3]/span/span/span</td>
 	<td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>