diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 0c56fc2bb..f7af625b3 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -101,6 +101,11 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
             $csrf_namespace->authtoken = sha1(uniqid(rand(), 1));
             $csrf_namespace->setExpirationSeconds(2 * 60 * 60);
         }
+
+        //Here we are closing the session for writing because otherwise no requests
+        //in this session will be handled in parallel. This gives a major boost to the perceived performance
+        //of the application (page load times are more consistent, no lock contention).
+        session_write_close();
     }
 
     /**
diff --git a/airtime_mvc/application/common/ProvisioningHelper.php b/airtime_mvc/application/common/ProvisioningHelper.php
index 580c20e52..605617105 100644
--- a/airtime_mvc/application/common/ProvisioningHelper.php
+++ b/airtime_mvc/application/common/ProvisioningHelper.php
@@ -10,7 +10,7 @@ class ProvisioningHelper
     // Parameter values
     private $dbuser, $dbpass, $dbname, $dbhost, $dbowner, $apikey;
     private $instanceId;
-    private $station_name, $description;
+    private $stationName, $description;
 
     public function __construct($apikey)
     {
@@ -40,18 +40,14 @@ class ProvisioningHelper
             if ($this->dbhost && !empty($this->dbhost)) {
                 $this->setNewDatabaseConnection();
 
-                //if ($this->checkDatabaseExists()) {
-                //    throw new Exception("ERROR: Airtime database already exists");
-                //}
-
                 if (!$this->checkDatabaseExists()) {
-                    throw new Exception("ERROR: $this->dbname database does not exist.");
+                    throw new DatabaseDoesNotExistException("ERROR: $this->dbname database does not exist.");
                 }
 
                 //We really want to do this check because all the Propel-generated SQL starts with "DROP TABLE IF EXISTS".
                 //If we don't check, then a second call to this API endpoint would wipe all the tables!
                 if ($this->checkTablesExist()) {
-                    throw new Exception("ERROR: airtime tables already exists");
+                    throw new DatabaseAlreadyExistsException();
                 }
 
                 $this->createDatabaseTables();
@@ -63,11 +59,19 @@ class ProvisioningHelper
             //All we need to do is create the database tables.
 
             $this->initializePrefs();
-        } catch (Exception $e) {
+        } catch (DatabaseDoesNotExistException $e) {
             http_response_code(400);
             Logging::error($e->getMessage());
             echo $e->getMessage() . PHP_EOL;
             return;
+        } catch (DatabaseAlreadyExistsException $e) {
+            // When we recreate a terminated instance, the process will fail
+            // if we return a 40x response here. In order to circumvent this,
+            // just return a 200; we still avoid dropping the existing tables
+            http_response_code(200);
+            Logging::info($e->getMessage());
+            echo $e->getMessage() . PHP_EOL;
+            return;
         }
 
         http_response_code(201);
@@ -108,7 +112,7 @@ class ProvisioningHelper
         $this->dbowner = $_POST['dbowner'];
         $this->instanceId = $_POST['instanceid'];
 
-        $this->station_name = $_POST['station_name'];
+        $this->stationName = $_POST['station_name'];
         $this->description = $_POST['description'];
     }
 
@@ -194,8 +198,8 @@ class ProvisioningHelper
      * Initialize preference values passed from the dashboard (if any exist)
      */
     private function initializePrefs() {
-        if ($this->station_name) {
-            Application_Model_Preference::SetStationName($this->station_name);
+        if ($this->stationName) {
+            Application_Model_Preference::SetStationName($this->stationName);
         }
         if ($this->description) {
             Application_Model_Preference::SetStationDescription($this->description);
@@ -203,3 +207,14 @@ class ProvisioningHelper
     }
 
 }
+
+class DatabaseAlreadyExistsException extends Exception {
+    private static $_defaultMessage = "ERROR: airtime tables already exists";
+    public function __construct($message = null, $code = 0, Exception $previous = null) {
+        $message = _((is_null($message) ? self::$_defaultMessage : $message));
+        parent::__construct($message, $code, $previous);
+    }
+}
+
+class DatabaseDoesNotExistException extends Exception {}
+
diff --git a/airtime_mvc/application/common/TuneIn.php b/airtime_mvc/application/common/TuneIn.php
new file mode 100644
index 000000000..6040fb184
--- /dev/null
+++ b/airtime_mvc/application/common/TuneIn.php
@@ -0,0 +1,48 @@
+<?php
+
+class Application_Common_TuneIn
+{
+    public static function sendMetadataToTunein($title, $artist)
+    {
+        $credQryStr = self::getCredentialsQueryString();
+        $metadataQryStr = "&title=".$title."&artist=".$artist."&commercial=false";
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, TUNEIN_API_URL . $credQryStr . $metadataQryStr);
+        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+        curl_exec($ch);
+        if (curl_error($ch)) {
+            Logging::error("Failed to reach TuneIn: ". curl_errno($ch)." - ". curl_error($ch) . " - " . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+        }
+        curl_close($ch);
+
+    }
+
+    private static function getCredentialsQueryString() {
+        $tuneInStationID = Application_Model_Preference::getTuneinStationId();
+        $tuneInPartnerID = Application_Model_Preference::getTuneinPartnerId();
+        $tuneInPartnerKey = Application_Model_Preference::getTuneinPartnerKey();
+
+        return "?partnerId=".$tuneInPartnerID."&partnerKey=".$tuneInPartnerKey."&id=".$tuneInStationID;
+    }
+
+    public static function updateOfflineMetadata() {
+        $credQryStr = self::getCredentialsQueryString();
+
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, TUNEIN_API_URL . $credQryStr . "&commercial=true");
+        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+        curl_exec($ch);
+        if (curl_error($ch)) {
+            Logging::error("Failed to reach TuneIn: ". curl_errno($ch)." - ". curl_error($ch) . " - " . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+        }
+        curl_close($ch);
+    }
+
+}
diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 548fa1fd3..bb5184895 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -11,7 +11,7 @@ define('COMPANY_SITE_URL'   , 'http://sourcefabric.org/');
 define('WHOS_USING_URL'             , 'http://sourcefabric.org/en/airtime/whosusing');
 define('TERMS_AND_CONDITIONS_URL'   , 'http://www.sourcefabric.org/en/about/policy/');
 define('PRIVACY_POLICY_URL'         , 'http://www.sourcefabric.org/en/about/policy/');
-define('USER_MANUAL_URL'            , 'http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/');
+define('USER_MANUAL_URL'            , 'http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters');
 
 define('LICENSE_VERSION'    , 'GNU AGPL v.3');
 define('LICENSE_URL'        , 'http://www.gnu.org/licenses/agpl-3.0-standalone.html');
@@ -92,3 +92,7 @@ define('SENTRY_CONFIG_PATH', '/etc/airtime-saas/sentry.airtime_web.ini');
 //Provisioning status
 define('PROVISIONING_STATUS_SUSPENDED' , 'Suspended');
 define('PROVISIONING_STATUS_ACTIVE' , 'Active');
+
+//TuneIn integration
+define("TUNEIN_API_URL", "http://air.radiotime.com/Playing.ashx");
+
diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 1aeab45d5..47b32b714 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -134,7 +134,7 @@ $pages = array(
             ),
             array(
                 'label'      => _('User Manual'),
-                'uri'        => "http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/",
+                'uri'        => "http://sourcefabric.booktype.pro/airtime-pro-for-broadcasters",
                 'target'     => "_blank"
             ),
             array(
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 11f6f7889..38c453d9e 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -1,4 +1,5 @@
 <?php
+require_once('TuneIn.php');
 
 class ApiController extends Zend_Controller_Action
 {
@@ -615,6 +616,14 @@ class ApiController extends Zend_Controller_Action
                     $file = Application_Model_StoredFile::RecallById($file_id);
                     $now = new DateTime("now", new DateTimeZone("UTC"));
                     $file->setLastPlayedTime($now);
+
+                    // Push metadata to TuneIn
+                    if (Application_Model_Preference::getTuneinEnabled()) {
+                        $filePropelOrm = $file->getPropelOrm();
+                        $title = urlencode($filePropelOrm->getDbTrackTitle());
+                        $artist = urlencode($filePropelOrm->getDbArtistName());
+                        Application_Common_TuneIn::sendMetadataToTunein($title, $artist);
+                    }
                 }
             } else {
                 // webstream
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 9d2ef2f9d..920a258cc 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -8,6 +8,8 @@ class LoginController extends Zend_Controller_Action
 
     public function init()
     {
+        //Open the session for writing, because we close it for writing by default in Bootstrap.php as an optimization.
+        session_start();
     }
 
     public function indexAction()
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 4f511f4b5..2bbe691e1 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -31,6 +31,8 @@ class PlaylistController extends Zend_Controller_Action
                     ->addActionContext('empty-content', 'json')
                     ->initContext();
 
+        //This controller writes to the session all over the place, so we're going to reopen it for writing here.
+        session_start(); //Reopen the session for writing
     }
 
     private function getPlaylist($p_type)
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index b06a9e1ed..741125422 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -32,6 +32,7 @@ class PreferenceController extends Zend_Controller_Action
         $form = new Application_Form_Preferences();
         $values = array();
 
+        session_start(); //Open session for writing.
 
         if ($request->isPost()) {
             $values = $request->getPost();
@@ -56,14 +57,19 @@ class PreferenceController extends Zend_Controller_Action
                     Application_Model_Preference::SetStationLogo($imagePath);
                 }
 
-                Application_Model_Preference::SetUploadToSoundcloudOption($values["UploadToSoundcloudOption"]);
+                Application_Model_Preference::setTuneinEnabled($values["enable_tunein"]);
+                Application_Model_Preference::setTuneinStationId($values["tunein_station_id"]);
+                Application_Model_Preference::setTuneinPartnerKey($values["tunein_partner_key"]);
+                Application_Model_Preference::setTuneinPartnerId($values["tunein_partner_id"]);
+
+                /*Application_Model_Preference::SetUploadToSoundcloudOption($values["UploadToSoundcloudOption"]);
                 Application_Model_Preference::SetSoundCloudDownloadbleOption($values["SoundCloudDownloadbleOption"]);
                 Application_Model_Preference::SetSoundCloudUser($values["SoundCloudUser"]);
                 Application_Model_Preference::SetSoundCloudPassword($values["SoundCloudPassword"]);
                 Application_Model_Preference::SetSoundCloudTags($values["SoundCloudTags"]);
                 Application_Model_Preference::SetSoundCloudGenre($values["SoundCloudGenre"]);
                 Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]);
-                Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);
+                Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);*/
 
                 $this->view->statusMsg = "<div class='success'>". _("Preferences updated.")."</div>";
                 $this->view->form = $form;
@@ -89,6 +95,8 @@ class PreferenceController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/support-setting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->statusMsg = "";
 
+        session_start(); //Open session for writing.
+
         $form = new Application_Form_SupportSettings();
         if ($request->isPost()) {
             $values = $request->getPost();
@@ -123,6 +131,8 @@ class PreferenceController extends Zend_Controller_Action
 
     public function removeLogoAction()
     {
+        session_start(); //Open session for writing.
+
         $this->view->layout()->disableLayout();
         // Remove reliance on .phtml files to render requests
         $this->_helper->viewRenderer->setNoRender(true);
@@ -140,6 +150,8 @@ class PreferenceController extends Zend_Controller_Action
 
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/preferences/streamsetting.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
+        session_start(); //Open session for writing.
+
         // get current settings
         $setting = Application_Model_StreamSetting::getStreamSetting();
 
@@ -176,9 +188,14 @@ class PreferenceController extends Zend_Controller_Action
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         $form = new Application_Form_StreamSetting();
 
-        $form->addElement('hash', 'csrf', array(
-           'salt' => 'unique'
-        ));
+        // $form->addElement('hash', 'csrf', array(
+        //     'salt' => 'unique'
+        // ));
+
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $csrf_element = new Zend_Form_Element_Hidden('csrf');
+        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
+        $form->addElement($csrf_element);
 
         $form->setSetting($setting);
         $form->startFrom();
@@ -425,6 +442,8 @@ class PreferenceController extends Zend_Controller_Action
 
     public function setSourceConnectionUrlAction()
     {
+        session_start(); //Open session for writing.
+
         $request = $this->getRequest();
         $type = $request->getParam("type", null);
         $url = urldecode($request->getParam("url", null));
@@ -443,6 +462,8 @@ class PreferenceController extends Zend_Controller_Action
 
     public function getAdminPasswordStatusAction()
     {
+        session_start(); //Open session for writing.
+
         $out = array();
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         for ($i=1; $i<=$num_of_stream; $i++) {
@@ -454,4 +475,69 @@ class PreferenceController extends Zend_Controller_Action
         }
         $this->_helper->json->sendJson($out);
     }
+
+    public function deleteAllFilesAction()
+    {
+        $this->view->layout()->disableLayout();
+        $this->_helper->viewRenderer->setNoRender(true);
+
+        // Only admin users should get here through ACL permissioning
+        // Only allow POST requests
+        $method = $_SERVER['REQUEST_METHOD'];
+        if (!($method == 'POST')) {
+            $this->getResponse()
+                 ->setHttpResponseCode(405)
+                 ->appendBody(_("Request method not accepted") . ": $method");
+            return;
+        }
+
+        $user = Application_Model_User::getCurrentUser();
+        $playlists = $blocks = $streams = [];
+
+        $allPlaylists = CcPlaylistQuery::create()->find();
+        foreach ($allPlaylists as $p) {
+            $playlists[] = $p->getDbId();
+        }
+
+        $allBlocks = CcBlockQuery::create()->find();
+        foreach ($allBlocks as $b) {
+            $blocks[] = $b->getDbId();
+        }
+
+        $allStreams = CcWebstreamQuery::create()->find();
+        foreach ($allStreams as $s) {
+            $streams[] = $s->getDbId();
+        }
+
+        // Delete all playlists, blocks, and streams
+        Application_Model_Playlist::deletePlaylists($playlists, $user->getId());
+        Application_Model_Block::deleteBlocks($blocks, $user->getId());
+        Application_Model_Webstream::deleteStreams($streams, $user->getId());
+
+        try {
+            // Delete all the cloud files
+            $CC_CONFIG = Config::getConfig();
+
+            foreach ($CC_CONFIG["supportedStorageBackends"] as $storageBackend) {
+                $proxyStorageBackend = new ProxyStorageBackend($storageBackend);
+                $proxyStorageBackend->deleteAllCloudFileObjects();
+            }
+        } catch(Exception $e) {
+            Logging::info($e->getMessage());
+        }
+
+        // Delete all files from the database
+        $files = CcFilesQuery::create()->find();
+        foreach ($files as $file) {
+            $storedFile = new Application_Model_StoredFile($file, null);
+            // Delete the files quietly to avoid getting Sentry errors for
+            // every S3 file we delete.
+            $storedFile->delete(true);
+        }
+
+        $this->getResponse()
+             ->setHttpResponseCode(200)
+             ->appendBody("OK");
+    }
+
 }
diff --git a/airtime_mvc/application/controllers/ProvisioningController.php b/airtime_mvc/application/controllers/ProvisioningController.php
index cda59e0db..06ee7a2ab 100644
--- a/airtime_mvc/application/controllers/ProvisioningController.php
+++ b/airtime_mvc/application/controllers/ProvisioningController.php
@@ -57,13 +57,16 @@ class ProvisioningController extends Zend_Controller_Action
 
     /**
      * Delete the Airtime Pro station's files from Amazon S3
+     *
+     * FIXME: When we deploy this next time, we should ensure that
+     *        this function can only be accessed with POST requests!
      */
     public function terminateAction()
     {
         $this->view->layout()->disableLayout();
         $this->_helper->viewRenderer->setNoRender(true);
 
-        if (!RestAuth::verifyAuth(true, true, $this)) {
+        if (!RestAuth::verifyAuth(true, false, $this)) {
             return;
         }
         
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 452788b23..8d7aa0587 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -1,4 +1,5 @@
 <?php
+require_once('TuneIn.php');
 
 $filepath = realpath (dirname(__FILE__));
 require_once($filepath."/../modules/rest/controllers/MediaController.php");
@@ -50,6 +51,11 @@ class ScheduleController extends Zend_Controller_Action
 
         $baseUrl = Application_Common_OsPath::getBaseDir();
 
+        //Embed the schedule in our page response so we don't have to make an AJAX request to get this data after the page load.
+        $scheduleController = new ScheduleController($this->getRequest(), $this->getResponse());
+        $scheduleController->eventFeedPreloadAction();
+        $events = json_encode($scheduleController->view->events);
+
         $this->view->headScript()->appendScript(
             "var calendarPref = {};\n".
             "calendarPref.weekStart = ".Application_Model_Preference::GetWeekStartDay().";\n".
@@ -58,7 +64,7 @@ class ScheduleController extends Zend_Controller_Action
             "calendarPref.timeScale = '".Application_Model_Preference::GetCalendarTimeScale()."';\n".
             "calendarPref.timeInterval = ".Application_Model_Preference::GetCalendarTimeInterval().";\n".
             "calendarPref.weekStartDay = ".Application_Model_Preference::GetWeekStartDay().";\n".
-            "var calendarEvents = null;"
+            "var calendarEvents = $events;"
         );
 
         $this->view->headScript()->appendFile($baseUrl.'js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@@ -144,7 +150,7 @@ class ScheduleController extends Zend_Controller_Action
         } else if ($calendar_interval == "agendaWeek") {
             list($start, $end) = Application_Model_Show::getStartEndCurrentWeekView();
         } else if ($calendar_interval == "month") {
-            list($start, $end) = Application_Model_Show::getStartEndCurrentMonthView();
+            list($start, $end) = Application_Model_Show::getStartEndCurrentMonthPlusView();
         } else {
             Logging::error("Invalid Calendar Interval '$calendar_interval'");
         }
@@ -294,9 +300,28 @@ class ScheduleController extends Zend_Controller_Action
         }
     }
 
+    /** This is a nasty hack to let us embed the the data the dashboard needs into the HTML response for each page.
+     *  This was originally loaded AFTER page load by AJAX, which is needlessly slow. This should have been templated in.
+     */
+    public static function printCurrentPlaylistForEmbedding()
+    {
+        $front = Zend_Controller_Front::getInstance();
+        $scheduleController = new ScheduleController($front->getRequest(), $front->getResponse());
+        $scheduleController->getCurrentPlaylistAction();
+        echo(json_encode($scheduleController->view));
+    }
+
     public function getCurrentPlaylistAction()
     {
         $range = Application_Model_Schedule::GetPlayOrderRangeOld();
+
+        // If there is no current track playing update TuneIn so it doesn't
+        // display outdated metadata
+        //TODO: find a better solution for this so we don't spam the station on TuneIn
+        /*if (is_null($range["current"]) && Application_Model_Preference::getTuneinEnabled()) {
+            Application_Common_TuneIn::updateOfflineMetadata();
+        }*/
+
         $show = Application_Model_Show::getCurrentShow();
 
         /* Convert all UTC times to localtime before sending back to user. */
diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 3bb30abf4..712bc0348 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -42,7 +42,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        //$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
 
@@ -67,7 +67,8 @@ class ShowbuilderController extends Zend_Controller_Action
                 if (isset($values["Privacy"])) {
                     Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                 }
-                // unset session
+                session_start();  //open session for writing again
+                // unset referrer
                 Zend_Session::namespaceUnset('referrer');
             } elseif ($values["Publicise"] == '1' && $form->isValid($values)) {
                 Application_Model_Preference::SetHeadTitle($values["stnName"], $this->view);
@@ -88,7 +89,8 @@ class ShowbuilderController extends Zend_Controller_Action
                 if (isset($values["Privacy"])) {
                     Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                 }
-                // unset session
+                session_start();  //open session for writing again
+                // unset referrer
                 Zend_Session::namespaceUnset('referrer');
             } else {
                 $logo = Application_Model_Preference::GetStationLogo();
@@ -156,7 +158,7 @@ class ShowbuilderController extends Zend_Controller_Action
         //populate date range form for show builder.
         $now  = time();
         $from = $request->getParam("from", $now);
-        $to   = $request->getParam("to", $now + (24*60*60));
+        $to   = $request->getParam("to", $now + (3*60*60));
 
         $utcTimezone = new DateTimeZone("UTC");
         $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone());
@@ -341,7 +343,8 @@ class ShowbuilderController extends Zend_Controller_Action
         $request = $this->getRequest();
         $selectedItems = $request->getParam("selectedItem");
         $afterItem = $request->getParam("afterItem");
-        
+
+        /*
         $log_vars = array();
         $log_vars["url"] = $_SERVER['HTTP_HOST'];
         $log_vars["action"] = "showbuilder/schedule-move";
@@ -349,6 +352,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $log_vars["params"]["selected_items"] = $selectedItems;
         $log_vars["params"]["destination_after_item"] = $afterItem;
         Logging::info($log_vars);
+        */
 
         try {
             $scheduler = new Application_Model_Scheduler();
diff --git a/airtime_mvc/application/controllers/SystemstatusController.php b/airtime_mvc/application/controllers/SystemstatusController.php
index dfc2d019b..543fbef70 100644
--- a/airtime_mvc/application/controllers/SystemstatusController.php
+++ b/airtime_mvc/application/controllers/SystemstatusController.php
@@ -13,16 +13,18 @@ class SystemstatusController extends Zend_Controller_Action
 
     public function indexAction()
     {
+        /*
         $services = array(
             "pypo"=>Application_Model_Systemstatus::GetPypoStatus(),
             "liquidsoap"=>Application_Model_Systemstatus::GetLiquidsoapStatus(),
             //"media-monitor"=>Application_Model_Systemstatus::GetMediaMonitorStatus(),
         );
+        */
 
         $partitions = Application_Model_Systemstatus::GetDiskInfo();
 
         $this->view->status = new StdClass;
-        $this->view->status->services = $services;
+        //$this->view->status->services = $services;
         $this->view->status->partitions = $partitions;
     }
 }
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 51ac869e7..4c3168f80 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -16,6 +16,9 @@ class UserController extends Zend_Controller_Action
 
     public function addUserAction()
     {
+        // Start the session to re-open write permission to the session so we can
+        // create the namespace for our csrf token verification
+        session_start();
         $CC_CONFIG = Config::getConfig();
 
         $request = $this->getRequest();
@@ -118,7 +121,8 @@ class UserController extends Zend_Controller_Action
     }
     
     public function editUserAction()
-    {        
+    {
+        session_start(); //Reopen session for writing.
         $request = $this->getRequest();
         $form = new Application_Form_EditUser();
         if ($request->isPost()) {
diff --git a/airtime_mvc/application/controllers/UsersettingsController.php b/airtime_mvc/application/controllers/UsersettingsController.php
index 9d8154578..35fbb19e1 100644
--- a/airtime_mvc/application/controllers/UsersettingsController.php
+++ b/airtime_mvc/application/controllers/UsersettingsController.php
@@ -61,28 +61,23 @@ class UsersettingsController extends Zend_Controller_Action
 
     public function getTimelineDatatableAction()
     {
-        $start = microtime(true);
-
         $data = Application_Model_Preference::getTimelineDatatableSetting();
         if (!is_null($data)) {
             $this->view->settings = $data;
         }
-
-        $end = microtime(true);
-
-        Logging::debug("getting timeline datatables info took:");
-        Logging::debug(floatval($end) - floatval($start));
     }
 
     public function remindmeAction()
     {
         // unset session
+        session_start();  //open session for writing again
         Zend_Session::namespaceUnset('referrer');
         Application_Model_Preference::SetRemindMeDate();
     }
     
     public function remindmeNeverAction()
     {
+        session_start();  //open session for writing again
         Zend_Session::namespaceUnset('referrer');
         //pass in true to indicate 'Remind me never' was clicked
         Application_Model_Preference::SetRemindMeDate(true);
@@ -91,6 +86,7 @@ class UsersettingsController extends Zend_Controller_Action
     public function donotshowregistrationpopupAction()
     {
         // unset session
+        session_start();  //open session for writing again
         Zend_Session::namespaceUnset('referrer');
     }
 
diff --git a/airtime_mvc/application/forms/DangerousPreferences.php b/airtime_mvc/application/forms/DangerousPreferences.php
new file mode 100644
index 000000000..28d203405
--- /dev/null
+++ b/airtime_mvc/application/forms/DangerousPreferences.php
@@ -0,0 +1,21 @@
+<?php
+
+class Application_Form_DangerousPreferences extends Zend_Form_SubForm {
+
+    public function init() {
+
+        $this->setDecorators(array(
+            array('ViewScript', array('viewScript' => 'form/preferences_danger.phtml'))
+        ));
+
+        $clearLibrary = new Zend_Form_Element_Button('clear_library');
+        $clearLibrary->setLabel(_('Delete All Tracks in Library'));
+        //$submit->removeDecorator('Label');
+        $clearLibrary->setAttribs(array('class'=>'btn centered'));
+        $clearLibrary->setAttrib('onclick', 'deleteAllFiles();');
+        $clearLibrary->removeDecorator('DtDdWrapper');
+
+        $this->addElement($clearLibrary);
+    }
+
+}
diff --git a/airtime_mvc/application/forms/Preferences.php b/airtime_mvc/application/forms/Preferences.php
index 3e5158413..d410ed3c6 100644
--- a/airtime_mvc/application/forms/Preferences.php
+++ b/airtime_mvc/application/forms/Preferences.php
@@ -12,18 +12,30 @@ class Application_Form_Preferences extends Zend_Form
 
         $general_pref = new Application_Form_GeneralPreferences();
 
-        $this->addElement('hash', 'csrf', array(
-           'salt' => 'unique',
-           'decorators' => array(
-                'ViewHelper'
-            )
-        ));
+        // $this->addElement('hash', 'csrf', array(
+        //     'salt' => 'unique',
+        //     'decorators' => array(
+        //         'ViewHelper'
+        //     )
+        // ));
+
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $csrf_element = new Zend_Form_Element_Hidden('csrf');
+        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
+        $this->addElement($csrf_element);
 
         $this->addSubForm($general_pref, 'preferences_general');
 
+        //tunein form
+        $tuneinPreferences = new Application_Form_TuneInPreferences();
+        $this->addSubForm($tuneinPreferences, 'preferences_tunein');
+
         $soundcloud_pref = new Application_Form_SoundcloudPreferences();
         $this->addSubForm($soundcloud_pref, 'preferences_soundcloud');
 
+        $danger_pref = new Application_Form_DangerousPreferences();
+        $this->addSubForm($danger_pref, 'preferences_danger');
+
         $submit = new Zend_Form_Element_Submit('submit');
         $submit->setLabel(_('Save'));
         //$submit->removeDecorator('Label');
diff --git a/airtime_mvc/application/forms/TuneInPreferences.php b/airtime_mvc/application/forms/TuneInPreferences.php
new file mode 100644
index 000000000..7eee0d56f
--- /dev/null
+++ b/airtime_mvc/application/forms/TuneInPreferences.php
@@ -0,0 +1,144 @@
+<?php
+require_once 'customvalidators/ConditionalNotEmpty.php';
+
+class Application_Form_TuneInPreferences extends Zend_Form_SubForm
+{
+    public function init()
+    {
+        $this->setDecorators(array(
+            array('ViewScript', array('viewScript' => 'form/preferences_tunein.phtml'))
+        ));
+
+        $enableTunein = new Zend_Form_Element_Checkbox("enable_tunein");
+        $enableTunein->setDecorators(array(
+            'ViewHelper',
+            'Errors',
+            'Label'
+        ));
+        $enableTunein->addDecorator('Label', array('class' => 'enable-tunein'));
+        $enableTunein->setLabel(_("Push metadata to your station on TuneIn?"));
+        $enableTunein->setValue(Application_Model_Preference::getTuneinEnabled());
+        $enableTunein->setAttrib("class", "block-display");
+        $this->addElement($enableTunein);
+
+        $tuneinStationId = new Zend_Form_Element_Text("tunein_station_id");
+        $tuneinStationId->setLabel(_("Station ID:"));
+        $tuneinStationId->setValue(Application_Model_Preference::getTuneinStationId());
+        $tuneinStationId->setAttrib("class", "input_text");
+        $this->addElement($tuneinStationId);
+
+        $tuneinPartnerKey = new Zend_Form_Element_Text("tunein_partner_key");
+        $tuneinPartnerKey->setLabel(_("Partner Key:"));
+        $tuneinPartnerKey->setValue(Application_Model_Preference::getTuneinPartnerKey());
+        $tuneinPartnerKey->setAttrib("class", "input_text");
+        $this->addElement($tuneinPartnerKey);
+
+        $tuneinPartnerId = new Zend_Form_Element_Text("tunein_partner_id");
+        $tuneinPartnerId->setLabel(_("Partner Id:"));
+        $tuneinPartnerId->setValue(Application_Model_Preference::getTuneinPartnerId());
+        $tuneinPartnerId->setAttrib("class", "input_text");
+        $this->addElement($tuneinPartnerId);
+    }
+
+    public function isValid($data)
+    {
+        $valid = true;
+        // Make request to TuneIn API to test the settings are valid.
+        // TuneIn does not have an API to make test requests to check if
+        // the credentials are correct. Therefore we will make a request
+        // with the commercial flag set to true, which removes the metadata
+        // from the station on TuneIn. After that, and if the test request
+        // succeeds, we will make another request with the real metadata.
+        if ($data["enable_tunein"]) {
+            $credentialsQryStr = "?partnerId=".$data["tunein_partner_id"]."&partnerKey=".$data["tunein_partner_key"]."&id=".$data["tunein_station_id"];
+            $commercialFlagQryStr = "&commercial=true";
+
+            $metadata = Application_Model_Schedule::getCurrentPlayingTrack();
+
+            if (is_null($metadata)) {
+                $qryStr = $credentialsQryStr . $commercialFlagQryStr;
+            } else {
+                $metadata["artist"] = empty($metadata["artist"]) ? "n/a" : $metadata["artist"];
+                $metadata["title"] = empty($metadata["title"]) ? "n/a" : $metadata["title"];
+                $metadataQryStr = "&artist=" . $metadata["artist"] . "&title=" . $metadata["title"];
+
+                $qryStr = $credentialsQryStr . $metadataQryStr;
+            }
+
+            $ch = curl_init();
+            curl_setopt($ch, CURLOPT_URL, TUNEIN_API_URL . $qryStr);
+            curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+            $xmlData = curl_exec($ch);
+            if (curl_error($ch)) {
+                Logging::error("Failed to reach TuneIn: ". curl_errno($ch)." - ". curl_error($ch) . " - " . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+                if (curl_error($ch) == "The requested URL returned error: 403 Forbidden") {
+                    $this->getElement("enable_tunein")->setErrors(array(_("Invalid TuneIn Settings. Please ensure your TuneIn settings are correct and try again.")));
+
+                    $valid = false;
+                }
+            }
+            curl_close($ch);
+
+            if ($valid) {
+                $xmlObj = new SimpleXMLElement($xmlData);
+                if (!$xmlObj || $xmlObj->head->status != "200") {
+                    $valid = false;
+                } else if ($xmlObj->head->status == "200") {
+                    $valid = true;
+
+                    // Make another request to TuneIn to update the metadata right away
+                    // and to turn off the commercial flag.
+
+                    /*$metadata = Application_Model_Schedule::getCurrentPlayingTrack();
+
+                    if (!is_null($metadata)) {
+
+                        Logging::info($metadata);
+                        // Replace empty strings with "n/a" since the TuneIn API will complain
+                        // and return an error that title and/or artist is not set.
+                        $metadata["artist"] = empty($metadata["artist"]) ? "n/a" : $metadata["artist"];
+                        $metadata["title"] = empty($metadata["title"]) ? "n/a" : $metadata["title"];
+                        Logging::info($metadata);
+
+                        $metadataQryStr = "&artist=" . $metadata["artist"] . "&title=" . $metadata["title"];
+
+                        $ch = curl_init();
+                        curl_setopt($ch, CURLOPT_URL, TUNEIN_API_URL . $qry_str . "&commercial=false" . $metadataQryStr);
+                        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+                        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+                        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+
+                        $xmlData = curl_exec($ch);
+                        Logging::info($xmlData);
+                        if (curl_error($ch)) {
+                            Logging::error("Failed to reach TuneIn: " . curl_errno($ch) . " - " . curl_error($ch) . " - " . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+                        }
+
+                        curl_close($ch);
+                        $xmlObj = new SimpleXMLElement($xmlData);
+                        if (!$xmlObj || $xmlObj->head->status != "200") {
+                            Logging::error("Failed updating metadata on TuneIn");
+                        }
+                    }*/
+
+                }
+            }
+        } else {
+            $valid = true;
+        }
+
+        if (!$valid) {
+            // Set values to what the user entered since the form is invalid so they
+            // don't have to enter in the values again and can see what they entered.
+            $this->getElement("enable_tunein")->setValue($data["enable_tunein"]);
+            $this->getElement("tunein_partner_key")->setValue($data["tunein_partner_key"]);
+            $this->getElement("tunein_partner_id")->setValue($data["tunein_partner_id"]);
+            $this->getElement("tunein_station_id")->setValue($data["tunein_station_id"]);
+        }
+
+        return $valid;
+    }
+}
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index d7cbad25e..c3f5f5e2d 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -34,6 +34,23 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
                 "scheduled_play_switch"=>$sss['scheduled_play'])) ?>
 <?php 	$partial = array('menu.phtml', 'default');
     $this->navigation()->menu()->setPartial($partial); ?>
+
+
+    <script type="text/javascript">
+        var schedulePreLoaded = <?php
+        //Awful hack to speed up loading - Embed the schedule in the response so that the dashboard
+        //doesn't have to make a separate AJAX request to get this data.
+    require_once("ScheduleController.php");
+    ScheduleController::printCurrentPlaylistForEmbedding();
+ ?>;
+        //The DOM elements that these calls depend on exist by this point:
+        parseItems(schedulePreLoaded.entries);
+        parseSourceStatus(schedulePreLoaded.source_status);
+        parseSwitchStatus(schedulePreLoaded.switch_status);
+
+    </script>
+
+
     <div id="nav">
         <div class="logo"></div>
         <div class="personal-block solo">
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 64263b94c..1387d326b 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -1453,4 +1453,44 @@ class Application_Model_Preference
     {
         return self::getValue("provisioning_status");
     }
+
+    public static function setTuneinEnabled($value)
+    {
+        self::setValue("tunein_enabled", $value);
+    }
+
+    public static function getTuneinEnabled()
+    {
+        return self::getValue("tunein_enabled");
+    }
+
+    public static function setTuneinPartnerKey($value)
+    {
+        self::setValue("tunein_partner_key", $value);
+    }
+
+    public static function getTuneinPartnerKey()
+    {
+        return self::getValue("tunein_partner_key");
+    }
+
+    public static function setTuneinPartnerId($value)
+    {
+        self::setValue("tunein_partner_id", $value);
+    }
+
+    public static function getTuneinPartnerId()
+    {
+        return self::getValue("tunein_partner_id");
+    }
+
+    public static function setTuneinStationId($value)
+    {
+        self::setValue("tunein_station_id", $value);
+    }
+
+    public static function getTuneinStationId()
+    {
+        return self::getValue("tunein_station_id");
+    }
 }
diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php
index 5daf227a2..fa05f3986 100644
--- a/airtime_mvc/application/models/RabbitMq.php
+++ b/airtime_mvc/application/models/RabbitMq.php
@@ -112,12 +112,7 @@ class Application_Model_RabbitMq
         $data['original_filename'] = $originalFilename;
         $data['callback_url'] = $callbackUrl;
         $data['api_key'] = $apiKey;
-        // Pass station name to the analyzer so we can set it with the file's
-        // metadata before uploading it to the cloud. This isn't a requirement
-        // for cloud storage, but put there as a safeguard, since all Airtime
-        // Pro stations will share the same bucket.
-        $data['station_domain'] = $stationDomain = Application_Model_Preference::GetStationName();
-        
+
         // We add a prefix to the resource name so files are not all placed
         // under the root folder. We do this in case we need to restore a 
         // customer's file/s; File restoration is done via the S3 Browser
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 138ceebfe..68a821e9b 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -56,6 +56,29 @@ SQL;
 
         return $real_streams;
     }
+
+    /**
+     * Returns an array with 2 elements: artist and title name of the track that is currently playing.
+     * Elements will be set to null if metadata is not set for those fields.
+     *
+     * Returns null if no track is currently playing.
+     *
+     * Data is based on GetPlayOrderRange() in this class.
+     */
+    public static function getCurrentPlayingTrack()
+    {
+        $currentScheduleInfo = self::GetPlayOrderRange();
+        if (empty($currentScheduleInfo["tracks"]["current"])) {
+            return null;
+        }
+
+        $currentTrackArray = explode(" - ", $currentScheduleInfo["tracks"]["current"]["name"]);
+        $currentTrackMetadata = array(
+            "artist" => empty($currentTrackArray[0]) ? null : urlencode($currentTrackArray[0]),
+            "title" => empty($currentTrackArray[1]) ? null : urlencode($currentTrackArray[1])
+        );
+        return $currentTrackMetadata;
+    }
     
     /**
      * Returns data related to the scheduled items.
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index edcf2da10..bcb01cf61 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -1012,10 +1012,10 @@ class Application_Model_Scheduler
      */
     public function moveItem($selectedItems, $afterItems, $adjustSched = true)
     {
-        $startProfile = microtime(true);
+        //$startProfile = microtime(true);
 
         $this->con->beginTransaction();
-        $this->con->useDebug(true);
+        //$this->con->useDebug(true);
 
         try {
 
@@ -1024,8 +1024,8 @@ class Application_Model_Scheduler
             $this->validateRequest($afterItems);
 
             $endProfile = microtime(true);
-            Logging::debug("validating move request took:");
-            Logging::debug(floatval($endProfile) - floatval($startProfile));
+            //Logging::debug("validating move request took:");
+            //Logging::debug(floatval($endProfile) - floatval($startProfile));
 
             $afterInstance = CcShowInstancesQuery::create()->findPK($afterItems[0]["instance"], $this->con);
 
@@ -1066,18 +1066,18 @@ class Application_Model_Scheduler
 
                 $this->removeGaps($instance, $schedIds);
 
-                $endProfile = microtime(true);
-                Logging::debug("removing gaps from instance $instance:");
-                Logging::debug(floatval($endProfile) - floatval($startProfile));
+                //$endProfile = microtime(true);
+                //Logging::debug("removing gaps from instance $instance:");
+                //Logging::debug(floatval($endProfile) - floatval($startProfile));
             }
 
-            $startProfile = microtime(true);
+            //$startProfile = microtime(true);
 
             $this->insertAfter($afterItems, null, $movedData, $adjustSched, true);
 
-            $endProfile = microtime(true);
-            Logging::debug("inserting after removing gaps.");
-            Logging::debug(floatval($endProfile) - floatval($startProfile));
+            //$endProfile = microtime(true);
+            //Logging::debug("inserting after removing gaps.");
+            //Logging::debug(floatval($endProfile) - floatval($startProfile));
 
             $modified = array_keys($modifiedMap);
             //need to adjust shows we have moved items from.
@@ -1087,7 +1087,7 @@ class Application_Model_Scheduler
                 $instance->updateScheduleStatus($this->con);
             }
 
-            $this->con->useDebug(false);
+            //$this->con->useDebug(false);
             $this->con->commit();
 
             Application_Model_RabbitMq::PushSchedule();
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 73925fc65..f96ad7ee0 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -974,10 +974,7 @@ SQL;
         foreach ($shows as &$show) {
             $options = array();
 
-            //only bother calculating percent for week or day view.
-            if (intval($days) <= 7) {
-                $options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]);
-            }
+            $options["percent"] = Application_Model_Show::getPercentScheduled($show["starts"], $show["ends"], $show["time_filled"]);
 
             if (isset($show["parent_starts"])) {
                 $parentStartsDT = new DateTime($show["parent_starts"], $utcTimezone);
@@ -1432,39 +1429,70 @@ SQL;
     }
 
     public static function getStartEndCurrentMonthView() {
-        $first_day_of_calendar_month_view = mktime(0, 0, 0, date("n"), 1);
-        $weekStart = Application_Model_Preference::GetWeekStartDay();
-        while (date('w', $first_day_of_calendar_month_view) != $weekStart) {
-            $first_day_of_calendar_month_view -= 60*60*24;
-        }
-        $last_day_of_calendar_view = $first_day_of_calendar_month_view + 3600*24*42;
 
-        $start = new DateTime("@".$first_day_of_calendar_month_view);
-        $end = new DateTime("@".$last_day_of_calendar_view);
+        $utcTimeZone = new DateTimeZone("UTC");
+
+        //We have to get the start of the day in the user's timezone, and then convert that to UTC.
+        $start = new DateTime("first day of this month", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
+
+        $start->setTimezone($utcTimeZone); //Covert it to UTC.
+        $monthInterval = new DateInterval("P1M");
+        $end = clone($start);
+        $end->add($monthInterval);
 
         return array($start, $end);
     }
 
+    /** Returns the start and end date that FullCalendar will display for today's month.
+     *
+     *  FullCalendar displays 6 weeks, starting on a Sunday, for a total of 42 days. This function returns 42 days worth
+     *  of data (a few days before, and a few days after.)
+     */
+    public static function getStartEndCurrentMonthPlusView() {
+
+        $utcTimeZone = new DateTimeZone("UTC");
+
+        //We have to get the start of the day in the user's timezone, and then convert that to UTC.
+        $start = new DateTime("first day of this month", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
+
+        $dayOfWeekNumeric = $start->format('w');
+        $start->sub(new DateInterval("P{$dayOfWeekNumeric}D")); //Subtract the index of the day of the week the month starts on. (adds this many days from the previous month)
+        $start->setTimezone($utcTimeZone); //Covert it to UTC.
+
+        $fullCalendarMonthInterval = new DateInterval("P42D"); //42 days
+        $end = clone($start);
+        $end->add($fullCalendarMonthInterval);
+
+        return array($start, $end);
+    }
+
+
     public static function getStartEndCurrentWeekView() {
-        $first_day_of_calendar_week_view = mktime(0, 0, 0, date("n"), date("j"));
-        $weekStart = Application_Model_Preference::GetWeekStartDay();
-        while (date('w', $first_day_of_calendar_week_view) != $weekStart) {
-            $first_day_of_calendar_week_view -= 60*60*24;
-        }
-        $last_day_of_calendar_view = $first_day_of_calendar_week_view + 3600*24*7;
 
-        $start = new DateTime("@".$first_day_of_calendar_week_view);
-        $end = new DateTime("@".$last_day_of_calendar_view);
+        $weekStartDayNum = Application_Model_Preference::GetWeekStartDay();
+        $utcTimeZone = new DateTimeZone("UTC");
 
+        //We have to get the start of the week in the user's timezone, and then convert that to UTC.
+        $start = new DateTime("Sunday last week", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
+        $start->add(new DateInterval("P{$weekStartDayNum}D")); //Shift the start date to the station's "Week Starts on Day"
+
+        $start->setTimezone($utcTimeZone); //Covert it to UTC.
+        $weekInterval = new DateInterval("P1W");
+        $end = clone($start);
+        $end->add($weekInterval);
         return array($start, $end);
     }
 
     public static function getStartEndCurrentDayView() {
-        $today = mktime(0, 0, 0, date("n"), date("j"));
-        $tomorrow = $today + 3600*24;
+        $utcTimeZone = new DateTimeZone("UTC");
 
-        $start = new DateTime("@".$today);
-        $end = new DateTime("@".$tomorrow);
+        //We have to get the start of the day in the user's timezone, and then convert that to UTC.
+        $start = new DateTime("today", new DateTimeZone(Application_Model_Preference::GetUserTimezone()));
+
+        $start->setTimezone($utcTimeZone); //Covert it to UTC.
+        $dayInterval = new DateInterval("P1D");
+        $end = clone($start);
+        $end->add($dayInterval);
 
         return array($start, $end);
     }
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 8e3dd7a59..32d6ec371 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -375,7 +375,7 @@ SQL;
      * Deletes the physical file from the local file system or from the cloud
      *
      */
-    public function delete()
+    public function delete($quiet=false)
     {
         // Check if the file is scheduled to be played in the future
         if (Application_Model_Schedule::IsFileScheduledInTheFuture($this->_file->getCcFileId())) {
@@ -405,8 +405,12 @@ SQL;
             }
             catch (Exception $e)
             {
-                //Just log the exception and continue.
-                Logging::error($e);
+                if ($quiet) {
+                    Logging::info($e);
+                } else {
+                    //Just log the exception and continue.
+                    Logging::error($e);
+                }
             }
         }
 
diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php
index c90adf3a5..ed879e90d 100644
--- a/airtime_mvc/application/services/CalendarService.php
+++ b/airtime_mvc/application/services/CalendarService.php
@@ -150,23 +150,27 @@ class Application_Service_CalendarService
                         $menu["edit"] = array(
                             "name" => _("Edit This Instance"),
                             "icon" => "edit",
-                            "url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
+                            "url" => $baseUrl . "Schedule/populate-repeating-show-instance-form"
+                        );
                     } else {
                         $menu["edit"] = array(
                             "name" => _("Edit"),
                             "icon" => "edit",
-                            "items" => array());
+                            "items" => array()
+                        );
 
                         $menu["edit"]["items"]["all"] = array(
                             "name" => _("Edit Show"),
                             "icon" => "edit",
-                            "url" => $baseUrl."Schedule/populate-show-form");
+                            "url" => $baseUrl . "Schedule/populate-show-form"
+                        );
 
                         $menu["edit"]["items"]["instance"] = array(
                             "name" => _("Edit This Instance"),
                             "icon" => "edit",
-                            "url" => $baseUrl."Schedule/populate-repeating-show-instance-form");
-                        }
+                            "url" => $baseUrl . "Schedule/populate-repeating-show-instance-form"
+                        );
+                    }
                 } else {
                     $menu["edit"] = array(
                         "name"=> _("Edit Show"),
diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php
index fb58e7e6f..ed610757e 100644
--- a/airtime_mvc/application/services/ShowFormService.php
+++ b/airtime_mvc/application/services/ShowFormService.php
@@ -153,14 +153,19 @@ class Application_Service_ShowFormService
         if ($ccShowDay->isShowStartInPast()) {
             //for a non-repeating show, we should never allow user to change the start time.
             //for a repeating show, we should allow because the form works as repeating template form
-            if (!$ccShowDay->isRepeating()) {
+            $form->disableStartDateAndTime();
+
+            // Removing this - if there is no future instance, this will throw an error.
+            // If there is a future instance, then we get a WHEN block representing the next instance
+            // which may be confusing.
+            /*if (!$ccShowDay->isRepeating()) {
                 $form->disableStartDateAndTime();
             } else {
                 list($showStart, $showEnd) = $this->getNextFutureRepeatShowTime();
                 if ($this->hasShowStarted($showStart)) {
                     $form->disableStartDateAndTime();
                 }
-            }
+            }*/
         }
 
         $form->populate(
@@ -410,9 +415,8 @@ class Application_Service_ShowFormService
 
         //if the show is repeating, set the start date to the next
         //repeating instance in the future
-        if ($this->ccShow->isRepeating()) {
-             list($originalShowStartDateTime,) = $this->getNextFutureRepeatShowTime();
-        } else {
+        $originalShowStartDateTime = $this->getCurrentOrNextInstanceStartTime();
+        if (!$originalShowStartDateTime) {
             $originalShowStartDateTime = $dt;
         }
 
@@ -421,26 +425,30 @@ class Application_Service_ShowFormService
 
     /**
      * 
-     * Returns 2 DateTime objects, in the user's local time,
-     * of the next future repeat show instance start and end time
+     * Returns a DateTime object, in the user's local time,
+     * of the current or next show instance start time
+     *
+     * Returns null if there is no next future repeating show instance
      */
-    public function getNextFutureRepeatShowTime()
+    public function getCurrentOrNextInstanceStartTime()
     {
         $ccShowInstance = CcShowInstancesQuery::create()
             ->filterByDbShowId($this->ccShow->getDbId())
             ->filterByDbModifiedInstance(false)
-            ->filterByDbStarts(gmdate("Y-m-d H:i:s"), Criteria::GREATER_THAN)
+            ->filterByDbStarts(gmdate("Y-m-d"), Criteria::GREATER_EQUAL)
             ->orderByDbStarts()
             ->findOne();
+
+        if (!$ccShowInstance) {
+            return null;
+        }
         
         $starts = new DateTime($ccShowInstance->getDbStarts(), new DateTimeZone("UTC"));
-        $ends = new DateTime($ccShowInstance->getDbEnds(), new DateTimeZone("UTC"));
         $showTimezone = $this->ccShow->getFirstCcShowDay()->getDbTimezone();
 
         $starts->setTimezone(new DateTimeZone($showTimezone));
-        $ends->setTimezone(new DateTimeZone($showTimezone));
 
-        return array($starts, $ends);
+        return $starts;
     }
 
 
diff --git a/airtime_mvc/application/views/scripts/embed/player.phtml b/airtime_mvc/application/views/scripts/embed/player.phtml
index 30d4736bc..6c3b1d06b 100644
--- a/airtime_mvc/application/views/scripts/embed/player.phtml
+++ b/airtime_mvc/application/views/scripts/embed/player.phtml
@@ -252,8 +252,8 @@
                 success: function(data) {
 
                     if (data.current === null) {
-                        if (data.currentShow != null) {
-                            //Master/show source have no current track but they do have a current show.
+                        if (data.currentShow != null && data.currentShow.length != 0) {
+                            // Master/show source have no current track but they do have a current show.
                             $("p.now_playing").html(data.currentShow[0].name);
                         } else {
                             $("p.now_playing").html("Offline");
diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml
index 0ffe1ea9d..d200bf627 100644
--- a/airtime_mvc/application/views/scripts/form/preferences.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences.phtml
@@ -2,8 +2,22 @@
     <?php echo $this->element->getElement('csrf') ?>
 
     <?php echo $this->element->getSubform('preferences_general') ?>
+
+    <h3 class="collapsible-header" id="tunein-pref-heading"><span class="arrow-icon"></span><?php echo _("TuneIn Settings"); ?></h3>
+    <div class="collapsible-content" id="tunein-settings">
+        <?php echo $this->element->getSubform('preferences_tunein') ?>
+    </div>
+
+
     <?php //No soundcloud stuff on Airtime Pro -- Albert ?>
 
+    <h3 class="collapsible-header" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
+    <div class="collapsible-content" id="dangerous-settings">
+        <?php echo $this->element->getSubform('preferences_danger') ?>
+    </div>
+
+    <br>
+
     <?php echo $this->element->submit->render() ?>
 
 </form>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_danger.phtml b/airtime_mvc/application/views/scripts/form/preferences_danger.phtml
new file mode 100644
index 000000000..7ea8a78d1
--- /dev/null
+++ b/airtime_mvc/application/views/scripts/form/preferences_danger.phtml
@@ -0,0 +1,14 @@
+<fieldset class="padded">
+    <dl class="zend_form">
+
+        <div class="warning" style="margin-bottom: 10px;">
+            <p class="warning-label">
+                <strong>Warning:</strong> These functions will have <strong>permanent and lasting effects</strong>
+                on your Airtime station. Think carefully before using them!
+            </p>
+        </div>
+
+        <?php echo $this->element->getElement('clear_library')->render() ?>
+
+    </dl>
+</fieldset>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_tunein.phtml b/airtime_mvc/application/views/scripts/form/preferences_tunein.phtml
new file mode 100644
index 000000000..d5fd34dd5
--- /dev/null
+++ b/airtime_mvc/application/views/scripts/form/preferences_tunein.phtml
@@ -0,0 +1,18 @@
+<fieldset class="padded">
+    <dl class="zend_form">
+
+        <?php if($this->element->getElement("enable_tunein")->hasErrors()) {
+            echo $this->element->getElement('enable_tunein')->renderErrors();
+        }
+        ?>
+        <?php echo $this->element->getElement('enable_tunein')->renderViewHelper() ?>
+        <?php echo $this->element->getElement('enable_tunein')->renderLabel() ?>
+
+        <?php echo $this->element->getElement('tunein_station_id')->render() ?>
+
+        <?php echo $this->element->getElement('tunein_partner_id')->render() ?>
+
+        <?php echo $this->element->getElement('tunein_partner_key')->render() ?>
+
+    </dl>
+</fieldset>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
index 2a31ac78e..de8dea94a 100644
--- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml
+++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
@@ -1,31 +1,6 @@
 <table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
-        <thead>
-            <tr class="ui-state-default strong">
-                <td><?php echo _("Service") ?></td>
-                <td><?php echo _("Status") ?></td>
-                <td><?php echo _("Uptime") ?></td>
-                <td><?php echo _("CPU") ?></td>
-                <td><?php echo _("Memory") ?></td>
-            </tr>
-        </thead>
+
         <tbody>
-            <!--
-            <tr class="odd">
-                <td><?php echo sprintf(_("%s Version"), PRODUCT_NAME) ?></td>
-                <td>1.9.3</td>
-                <td>&nbsp;</td>
-            </tr>
-            -->
-            <?php $i=0; ?>
-            <?php foreach($this->status->services as $key=>$value): ?>
-                <tr class="<?php echo ($i&1) == 0 ? "even":"odd"; $i++; ?>" id="<?php echo $value["name"]; ?>">
-                    <td><?php echo $value["name"]; ?></td>
-                    <td><span></span></td>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                </tr>
-            <?php endforeach; ?>
             <tr id="partitions" class="even">
                 <th colspan="5"><?php echo _("Disk Space") ?></th>
             </tr>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index b80cbfe8e..4331af511 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1788,7 +1788,7 @@ ul.errors {
     width:278px;
 }
 
-ul.errors li {
+ul.errors li, .warning {
     color:#902d2d;
     font-size:11px;
     padding:2px 4px;
@@ -1798,6 +1798,11 @@ ul.errors li {
     list-style: none;
 }
 
+.warning-label {
+    font-size: medium;
+    text-align: center;
+}
+
 div.success{
     color:#3B5323;
     font-size:11px;
@@ -2255,14 +2260,9 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
 .radio-inline-list label {
     margin-right:12px;
 }
-.preferences.simple-formblock dd.block-display {
-    width: 100%;
-}
-
-.preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select {
-    width: 100%;
-}
-.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
+.preferences.simple-formblock dd.block-display,
+ .preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select,
+ .preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
     width: 100%;
 }
 .preferences dd.block-display .input_text_area, .preferences dd.block-display .input_text 
@@ -2284,6 +2284,15 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
     margin-bottom: 4px;
 }
 
+.preferences #Logo-img-container {
+    margin-top: 30px;
+}
+
+.centered {
+    margin: 0 auto;
+    display: block;
+}
+
 #show_time_info {
     font-size:12px;
     height:30px;
@@ -3248,3 +3257,7 @@ dd .stream-status {
     padding-bottom: 0px;
     padding-top: 13px;
 }
+
+.enable-tunein {
+    font-weight:bold;
+}
diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index e4ffc1faf..2f3cc0ae5 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -395,7 +395,6 @@ function getScheduleFromServer(){
                 parseSourceStatus(data.source_status);
                 parseSwitchStatus(data.switch_status);
                 showName = data.show_name;
-                setTimeout(getScheduleFromServer, serverUpdateInterval);
           }, error:function(jqXHR, textStatus, errorThrown){}});
 }
 
@@ -456,8 +455,8 @@ var stream_window = null;
 
 function init() {
     //begin producer "thread"
-    getScheduleFromServer();
-    
+    setInterval(getScheduleFromServer, serverUpdateInterval);
+
     //begin consumer "thread"
     secondsTimer();
 
diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
index bccef632b..ad156dfe8 100644
--- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
+++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
@@ -213,3 +213,21 @@ function resizeToMaxHeight(ele, targetHeight){
         img.css("width", newWidth+"px");
     }
 }
+
+/* From http://stackoverflow.com/questions/123999/how-to-tell-if-a-dom-element-is-visible-in-the-current-viewport/#7557433 */
+function isInView(el) {
+    //special bonus for those using jQuery
+    if (typeof jQuery === "function" && el instanceof jQuery) {
+        el = el[0];
+    }
+
+    var rect = el.getBoundingClientRect();
+
+    return (
+    rect.top >= 0 &&
+    rect.left >= 0 &&
+    rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) && /*or $(window).height() */
+    rect.right <= (window.innerWidth || document.documentElement.clientWidth) /*or $(window).width() */
+    );
+}
+
diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
index f87dafcd7..315caf986 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -8,20 +8,31 @@ var AIRTIME = (function(AIRTIME) {
     mod = AIRTIME.library;
 
     mod.checkAddButton = function() {
-        var selected = mod.getChosenItemsLength(), $cursor = $('tr.cursor-selected-row'), check = false;
+        var selected = mod.getChosenItemsLength(), $cursor = $('tr.sb-selected'), check = false,
+            shows = $('tr.sb-header'), current = $('tr.sb-current-show'),
+            cursorText = $.i18n._('Add to next show');
 
         // make sure library items are selected and a cursor is selected.
-        if (selected !== 0 && $cursor.length !== 0) {
+        if (selected !== 0) {
             check = true;
         }
 
+        if (shows.length === 0) {
+            check = false;
+        }
+
         if (check === true) {
             AIRTIME.button.enableButton("btn-group #library-plus", false);
         } else {
             AIRTIME.button.disableButton("btn-group #library-plus", false);
         }
-        
-        AIRTIME.library.changeAddButtonText($('.btn-group #library-plus #lib-plus-text'), ' '+$.i18n._('Add to selected show'));
+
+        if ($cursor.length !== 0) {
+            cursorText = $.i18n._('Add before selected items');
+        } else if (current.length !== 0) {
+            cursorText = $.i18n._('Add to current show');
+        }
+        AIRTIME.library.changeAddButtonText($('.btn-group #library-plus #lib-plus-text'), ' '+ cursorText);
     };
 
     mod.fnRowCallback = function(nRow, aData, iDisplayIndex, iDisplayIndexFull) {
@@ -98,7 +109,7 @@ var AIRTIME = (function(AIRTIME) {
             "type" : type
         });
 
-        $("#show_builder_table tr.cursor-selected-row").each(function(i, el) {
+        $("#show_builder_table tr.sb-selected").each(function(i, el) {
             aData.push($(el).prev().data("aData"));
         });
 
@@ -113,12 +124,35 @@ var AIRTIME = (function(AIRTIME) {
         }
 
         if (aSchedIds.length == 0) {
-            alert($.i18n._("Please select a cursor position on timeline."));
-            return false;
+            addToCurrentOrNext(aSchedIds);
         }
+
         AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
     };
 
+    function addToCurrentOrNext(arr) {
+        var el;
+        // Get the show instance id of the first non-data row (id = 0)
+        // The second last row in the table with that instance id is the
+        // last schedule item for the first show. (This is important for
+        // the Now Playing screen if multiple shows are in view).
+        el = $("[si_id="+$("#0").attr("si_id")+"]");
+        var temp = el.eq(-2).data("aData");
+        arr.push({
+            "id" : temp.id,
+            "instance" : temp.instance,
+            "timestamp" : temp.timestamp
+        });
+
+        if (!isInView(el)) {
+            $('.dataTables_scrolling.sb-padded').animate({
+                scrollTop: el.offset().top
+            }, 0);
+        }
+
+        return arr;
+    }
+
     mod.setupLibraryToolbar = function() {
         var $toolbar = $(".lib-content .fg-toolbar:first");
 
@@ -146,7 +180,7 @@ var AIRTIME = (function(AIRTIME) {
                             });
                         }
     
-                        $("#show_builder_table tr.cursor-selected-row")
+                        $("#show_builder_table tr.sb-selected")
                                 .each(function(i, el) {
                                     aData.push($(el).prev().data("aData"));
                                 });
@@ -161,6 +195,10 @@ var AIRTIME = (function(AIRTIME) {
                                 "timestamp" : temp.timestamp
                             });
                         }
+
+                        if (aSchedIds.length == 0) {
+                            addToCurrentOrNext(aSchedIds);
+                        }
     
                         AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
                     });
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 7f5471bfa..dae2d916e 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -109,7 +109,7 @@ var AIRTIME = (function(AIRTIME) {
     
     mod.changeAddButtonText = function($button, btnText) {
         $button.text(btnText);
-    }
+    };
     
     mod.createToolbarButtons = function() {
         $menu = $("<div class='btn-toolbar' />");
@@ -135,7 +135,7 @@ var AIRTIME = (function(AIRTIME) {
                             "<i class='icon-white icon-trash'></i>" +
                         "</button>" +
                     "</div>");
-    }
+    };
     
     mod.createToolbarDropDown = function() {
         $('#sb-select-page').click(function(){mod.selectCurrentPage();});
@@ -530,12 +530,14 @@ var AIRTIME = (function(AIRTIME) {
             },
             "fnStateSave": function (oSettings, oData) {
                 localStorage.setItem('datatables-library', JSON.stringify(oData));
+                /*
                 $.ajax({
                     url: baseUrl+"usersettings/set-library-datatable",
                     type: "POST",
                     data: {settings : oData, format: "json"},
                     dataType: "json"
                   });
+                  */
                 
                 colReorderMap = oData.ColReorder;
             },
@@ -890,7 +892,6 @@ var AIRTIME = (function(AIRTIME) {
             }
         });
        
-        checkImportStatus();
         checkLibrarySCUploadStatus();
         
         addQtipToSCIcons();
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 1dffe24d2..252a64a99 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -1,18 +1,13 @@
 function showErrorSections() {
-    if($("#soundcloud-settings .errors").length > 0) {
-        $("#soundcloud-settings").show();
-        $(window).scrollTop($("#soundcloud-settings .errors").position().top);
-    }
-    
-    if($("#email-server-settings .errors").length > 0) {
-        $("#email-server-settings").show();
-        $(window).scrollTop($("#email-server-settings .errors").position().top);
-    }
-    
-    if($("#livestream-settings .errors").length > 0) {
-        $("#livestream-settings").show();
-        $(window).scrollTop($("#livestream-settings .errors").position().top);
-    }
+    var selector = $("[id$=-settings]");
+    selector.each(function(i) {
+        var el = $(this);
+        var errors = el.find(".errors");
+        if (errors.length > 0) {
+            el.show();
+            $(window).scrollTop(errors.position().top);
+        }
+    });
 }
 
 function setConfigureMailServerListener() {
@@ -63,6 +58,30 @@ function setMailServerInputReadonly() {
     setMsAuthenticationFieldsReadonly(requiresAuthCB);
 }
 
+function setTuneInSettingsListener() {
+    var enableTunein = $("#enable_tunein");
+    enableTunein.click(function(event){
+        setTuneInSettingsReadonly();
+    });
+}
+
+function setTuneInSettingsReadonly() {
+    var enableTunein = $("#enable_tunein");
+    var stationId = $("#tunein_station_id");
+    var partnerKey = $("#tunein_partner_key");
+    var partnerId = $("#tunein_partner_id");
+
+    if (enableTunein.is(':checked')) {
+        stationId.removeAttr("readonly");
+        partnerKey.removeAttr("readonly");
+        partnerId.removeAttr("readonly");
+    } else {
+        stationId.attr("readonly", "readonly");
+        partnerKey.attr("readonly", "readonly");
+        partnerId.attr("readonly", "readonly");
+    }
+}
+
 /*
  * Enable/disable mail server authentication fields
  */
@@ -120,6 +139,14 @@ function removeLogo() {
     location.reload();
 }
 
+function deleteAllFiles() {
+    var resp = confirm($.i18n._("Are you sure you want to delete all the tracks in your library?"))
+    if (resp) {
+        $.post(baseUrl+'Preference/delete-all-files', function(json){});
+        location.reload();
+    }
+}
+
 $(document).ready(function() {
 
     $('.collapsible-header').live('click',function() {
@@ -128,6 +155,10 @@ $(document).ready(function() {
         return false;
     }).next().hide();
 
+    if ($("#tunein-settings").find(".errors").length > 0) {
+        $(".collapsible-content#tunein-settings").show();
+    }
+
     /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
     $('#pref_save').live('click', function() {
         var data = $('#pref_form').serialize();
@@ -151,4 +182,6 @@ $(document).ready(function() {
     setConfigureMailServerListener();
     setEnableSystemEmailsListener();
     setCollapsibleWidgetJsCode();
+    setTuneInSettingsReadonly();
+    setTuneInSettingsListener();
 });
diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 01b1096d5..0a3ae1b3b 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -360,13 +360,7 @@ function windowResize() {
 }
 
 function preloadEventFeed () {
-    var url = baseUrl+'Schedule/event-feed-preload';
-    var d = new Date();
-
-    $.post(url, {format: "json", cachep: d.getTime()}, function(json){
-        calendarEvents = json.events;
-        createFullCalendar({calendarInit: calendarPref});
-    });
+    createFullCalendar({calendarInit: calendarPref});
 }
 
 var initialLoad = true;
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index d734853ea..bf2937bcd 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -312,7 +312,7 @@ function createFullCalendar(data){
         ],
         contentHeight: mainHeight,
         theme: true,
-        lazyFetching: false,
+        lazyFetching: true,
         serverTimestamp: parseInt(data.calendarInit.timestamp, 10),
         serverTimezoneOffset: parseInt(data.calendarInit.timezoneOffset, 10),
        
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 3eee4d92f..8a57b4bd2 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -278,7 +278,8 @@ var AIRTIME = (function(AIRTIME){
         oSchedTable.fnDraw();
 
         mod.enableUI();
-        $("#library_content").find("#library_display").dataTable().fnStandingRedraw();
+        //Unneccessary reload of the library pane after moving tracks in the showbuilder pane.
+        //$("#library_content").find("#library_display").dataTable().fnStandingRedraw();
     };
     
     mod.getSelectedCursors = function() {
@@ -398,13 +399,20 @@ var AIRTIME = (function(AIRTIME){
 
         $scroll.scrollTop(currentTop - scrollingTop + scrolled);
     }
-    
+
     mod.builderDataTable = function() {
         $sbContent = $('#show_builder');
         $lib = $("#library_content"),
         $sbTable = $sbContent.find('table');
         var isInitialized = false;
 
+        var emptyNode = document.createElement('div');
+        var lockedPreviewIcon = document.createElement('span');
+        lockedPreviewIcon.setAttribute('class', 'ui-icon ui-icon-locked');
+        var previewIcon = document.createElement('img');
+        previewIcon.setAttribute('src', baseUrl+'css/images/icon_audioclip.png');
+        previewIcon.setAttribute('title', $.i18n._("Track preview"));
+
         oSchedTable = $sbTable.dataTable( {
             "aoColumns": [
             /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
@@ -429,6 +437,7 @@ var AIRTIME = (function(AIRTIME){
             "bServerSide": true,
             "bInfo": false,
             "bAutoWidth": false,
+            "bDeferRender": true,
             
             "bStateSave": true,
             "fnStateSaveParams": function (oSettings, oData) {
@@ -439,13 +448,14 @@ var AIRTIME = (function(AIRTIME){
             "fnStateSave": function fnStateSave(oSettings, oData) {
                
                 localStorage.setItem('datatables-timeline', JSON.stringify(oData));
-                
+
+                /*
                 $.ajax({
                   url: baseUrl+"usersettings/set-timeline-datatable",
                   type: "POST",
                   data: {settings : oData, format: "json"},
                   dataType: "json"
-                });
+                });*/
             },
             "fnStateLoad": function fnBuilderStateLoad(oSettings) {
                 var settings = localStorage.getItem('datatables-timeline');
@@ -466,7 +476,8 @@ var AIRTIME = (function(AIRTIME){
                         a[i] = (a[i] === "true") ? true : false;
                     }
                 }
-                
+
+                /*
                 a = oData.ColReorder;
                 if (a) {
                     for (i = 0, length = a.length; i < length; i++) {
@@ -474,7 +485,7 @@ var AIRTIME = (function(AIRTIME){
                             a[i] = parseInt(a[i], 10);
                         }
                     }
-                }
+                }*/
                
                 oData.iCreate = parseInt(oData.iCreate, 10);
             },
@@ -494,8 +505,13 @@ var AIRTIME = (function(AIRTIME){
                     headerIcon;
 
                 fnPrepareSeparatorRow = function fnPrepareSeparatorRow(sRowContent, sClass, iNodeIndex) {
+                    //Albert:
+                    //$(nRow.children[iNodeIndex]).replaceWith(emptyNode);
+
+
                     $node = $(nRow.children[iNodeIndex]);
                     $node.html(sRowContent);
+
                     $node.attr('colspan',100);
                     for (i = iNodeIndex + 1, length = nRow.children.length; i < length; i = i+1) {
                         $node = $(nRow.children[i]);
@@ -504,6 +520,7 @@ var AIRTIME = (function(AIRTIME){
                     }
                     
                     $nRow.addClass(sClass);
+
                 };
                         
                 if (aData.header === true) {
@@ -576,7 +593,9 @@ var AIRTIME = (function(AIRTIME){
                     $nRow.find('td').removeClass();
                     
                     $node = $(nRow.children[0]);
-                    $node.html('');
+                    if ($node) {
+                        $node.empty();
+                    }
                     
                     sSeparatorHTML = '<span>'+$.i18n._("Show Empty")+'</span>';
                     cl = cl + " sb-empty odd";
@@ -592,24 +611,32 @@ var AIRTIME = (function(AIRTIME){
                     
                     sSeparatorHTML = '<span>'+$.i18n._("Recording From Line In")+'</span>';
                     cl = cl + " sb-record odd";
-                    
                     fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
                 }
                 else {
                     
                      //add the play function if the file exists on disk.
                     $image = $nRow.find('td.sb-image');
+                    $image.empty();
                     //check if the file exists.
                     if (aData.image === true) {
                         $nRow.addClass("lib-audio");
                         if (!isAudioSupported(aData.mime)) {
-                            $image.html('<span class="ui-icon ui-icon-locked"></span>');
+                            //$image.html('<span class="ui-icon ui-icon-locked"></span>');
+                            $image.append(lockedPreviewIcon);
                         } else {
+                            /*
                             $image.html('<img title="'+$.i18n._("Track preview")+'" src="'+baseUrl+'css/images/icon_audioclip.png"></img>')
                             .click(function() {
                                 open_show_preview(aData.instance, aData.pos);
                                 return false;
+                            });*/
+                            $image.append(previewIcon.cloneNode(false));
+                            $image.click(function() {
+                                open_show_preview(aData.instance, aData.pos);
+                                return false;
                             });
+
                         }
                     }
                     else {
@@ -625,13 +652,13 @@ var AIRTIME = (function(AIRTIME){
                             hide: 'mouseout'
                         });
                     }
-                    
+
                     $node = $(nRow.children[0]);
                     if (aData.allowed === true && aData.scheduled >= 1 && aData.linked_allowed) {
                         $node.html('<input type="checkbox" name="'+aData.id+'"></input>');
                     }
                     else {
-                        $node.html('');
+                        $node.empty();
                     }
                 }
                 
@@ -705,7 +732,6 @@ var AIRTIME = (function(AIRTIME){
                 $("#draggingContainer").remove();
             },
             "fnDrawCallback": function fnBuilderDrawCallback(oSettings, json) {
-                var isInitialized = false;
 
                 if (!isInitialized) {
                     //when coming to 'Now Playing' page we want the page
@@ -730,7 +756,8 @@ var AIRTIME = (function(AIRTIME){
                     heights = [];
                 
                 clearTimeout(mod.timeout);
-                
+
+                /*
                 //only create the cursor arrows if the library is on the page.
                 if ($lib.length > 0 && $lib.filter(":visible").length > 0) {
 
@@ -775,18 +802,18 @@ var AIRTIME = (function(AIRTIME){
                             $tr = $table.find("tr[id="+cursorIds[i]+"][si_id="+showInstanceIds[i]+"]");
                         }
 						
-                        /* If the currently playing track's cursor is selected, 
-                         * and that track is deleted, the cursor position becomes
-                         * unavailble. We have to check the position is available
-                         * before re-highlighting it.
-                         */
+                        //If the currently playing track's cursor is selected,
+                        //and that track is deleted, the cursor position becomes
+                        //unavailble. We have to check the position is available
+                         // before re-highlighting it.
+                        //
                         if ($tr.find(".sb-checkbox").children().hasClass("innerWrapper")) {
                             mod.selectCursor($tr);
                             
-                        /* If the selected cursor is the footer row we need to
-                         * explicitly select it because that row does not have
-                         * innerWrapper class
-                         */     
+                        // If the selected cursor is the footer row we need to
+                         //explicitly select it because that row does not have
+                         // innerWrapper class
+                         //
                         } else if ($tr.hasClass("sb-footer")) {
                             mod.selectCursor($tr);	
                         }
@@ -801,8 +828,9 @@ var AIRTIME = (function(AIRTIME){
                     }
                     
                     $parent.append($table);
+
                 }
-                
+                 */
                 //order of importance of elements for setting the next timeout.
                 elements = [
                     $sbTable.find("tr."+NOW_PLAYING_CLASS),
@@ -826,6 +854,7 @@ var AIRTIME = (function(AIRTIME){
                         break;
                     }
                 }
+
                 
                 mod.checkToolBarIcons();
             },
@@ -957,9 +986,9 @@ var AIRTIME = (function(AIRTIME){
                 //item was reordered.
                 else {
                     
-                    ui.item
-                        .empty()
-                        .after(draggingContainer.html());
+                    //ui.item
+                    //    .empty()
+                    //    .after(draggingContainer.html());
                     
                     aItemData.push(ui.item.data("aData"));
                     fnMove();
@@ -968,9 +997,10 @@ var AIRTIME = (function(AIRTIME){
             
             return {
                 placeholder: "sb-placeholder ui-state-highlight",
-                forcePlaceholderSize: true,
+                //forcePlaceholderSize: true,
                 distance: 10,
-                helper: function(event, item) {
+                helper:
+                    function(event, item) {
                     var selected = mod.getSelectedData(NOW_PLAYING_CLASS),          
                         thead = $("#show_builder_table thead"),
                         colspan = thead.find("th").length,
@@ -985,23 +1015,34 @@ var AIRTIME = (function(AIRTIME){
                     }
                     
                     if (selected.length === 1) {
-                        message = $.i18n._("Moving 1 Item");
-                    }
-                    else {
-                        message = sprintf($.i18n._("Moving %s Items"), selected.length);
-                    }
-                    
-                    draggingContainer = $('<tr/>')
-                        .addClass('sb-helper')
-                        .append('<td/>')
-                        .find("td")
+                        message = sprintf($.i18n._("Moving %s"), selected[0].title);
+                        //draggingContainer = item; //Default DataTables drag and drop
+                        draggingContainer = $('<tr/>')
+                            .addClass('sb-helper')
+                            .append('<td/>')
+                            .find("td")
                             .attr("colspan", colspan)
                             .width(width)
                             .height(height)
                             .addClass("ui-state-highlight")
                             .append(message)
                             .end();
-  
+                    }
+                    else {
+                        message = sprintf($.i18n._("Moving %s Items"), selected.length);
+                        draggingContainer = $('<tr/>')
+                            .addClass('sb-helper')
+                            .append('<td/>')
+                            .find("td")
+                            .attr("colspan", colspan)
+                            .width(width)
+                            .height(height)
+                            .addClass("ui-state-highlight")
+                            .append(message)
+                            .end();
+
+                    }
+
                     helperData = selected;
                     
                     return draggingContainer; 
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index d83fe006e..ee23aa6f1 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -168,7 +168,7 @@ AIRTIME = (function(AIRTIME) {
         $builder.find(dateStartId)
         	.datepicker(oBaseDatePickerSettings)
         	.blur(validateTimeRange);
-        
+
         $builder.find(timeStartId)
         	.timepicker(oBaseTimePickerSettings)
         	.blur(validateTimeRange);
@@ -328,10 +328,10 @@ AIRTIME = (function(AIRTIME) {
                     setTimeout(checkScheduleUpdates, 5000);
                 }
             });
-        }
 
-        //check if the timeline view needs updating.
-        checkScheduleUpdates();
+            //check if the timeline view needs updating.
+            setTimeout(checkScheduleUpdates, 5000);
+        }
     };
 
     mod.onResize = function() {
diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py
index a3b306f2b..0e57ac076 100644
--- a/python_apps/airtime_analyzer/setup.py
+++ b/python_apps/airtime_analyzer/setup.py
@@ -29,7 +29,7 @@ setup(name='airtime_analyzer',
           'coverage',
           'mock',
           'python-daemon==1.6',
-          'requests',
+          'requests>=2.7.0',
           'apache-libcloud',
           'rgain',
           'boto',
diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
index ccc3a0776..fb3452181 100644
--- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq
+++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq
@@ -249,6 +249,7 @@ s = if dj_live_stream_port != 0 and dj_live_stream_mp != "" then
                 on_connect=live_dj_connect,
                 on_disconnect=live_dj_disconnect))
 
+    dj_live = on_metadata(notify_queue, dj_live)
     ignore(output.dummy(dj_live, fallible=true))
 
     switch(id="show_schedule_noise_switch",
@@ -271,6 +272,7 @@ s = if master_live_stream_port != 0 and master_live_stream_mp != "" then
                 on_connect=master_dj_connect,
                 on_disconnect=master_dj_disconnect))
 
+    master_dj = on_metadata(notify_queue, master_dj)
     ignore(output.dummy(master_dj, fallible=true))
 
     switch(id="master_show_schedule_noise_switch",
@@ -282,6 +284,8 @@ else
     s
 end
 
+# Send metadata notifications when using master source
+s = on_metadata(notify_queue, s)
 
 # Attach a skip command to the source s:
 #add_skip_command(s)