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

Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js

airtime_mvc/application/controllers/FeedsController.php

@@ -15,7 +15,7 @@ class FeedsController extends Zend_Controller_Action
             return;
         }
 
-        header('Content-Type: text/xml');
+        header('Content-Type: text/xml; charset=UTF-8');
 
         echo Application_Service_PodcastService::createStationRssFeed();
     }

airtime_mvc/application/services/PodcastEpisodeService.php

@@ -245,7 +245,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
         }
         // XXX: We should maybe try to alias this so we don't pass CcFiles as an array key to the frontend.
         //      It would require us to iterate over all the episodes and change the key for the response though...
-        $episodes = $episodes->joinWith('PodcastEpisodes.CcFiles')
+        $episodes = $episodes->joinWith('PodcastEpisodes.CcFiles', Criteria::LEFT_JOIN)
             ->setOffset($offset)
             ->orderBy($sortColumn, $sortDir)
             ->find();

airtime_mvc/application/views/scripts/podcast/station_podcast.phtml

@@ -1,7 +1,7 @@
 <div class="angular_wrapper" ng-controller="StationPodcast">
     <div class="inner_editor_title">
         <h2>
-            <?php echo _("Editing ") ?>"<span ng-bind="podcast.title" class="title_obj_name"></span>"
+            <span class="title_obj_name"><?php echo _("My Station Podcast") ?></span>
         </h2>
         <a href="{{podcast.url}}" target="_blank">
             <button class="btn"><?php echo _("View Feed") ?></button>