Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

ruby/lib/jam_ruby/models/active_music_session.rb

@@ -687,6 +687,16 @@ module JamRuby
       session.scheduled_start = self.created_at unless session.scheduled_start
       session.save!
 
+      feed = Feed.find_by_music_session_id(self.id)
+
+      if feed.nil?
+        feed = Feed.new
+        feed.music_session_id = self.id
+      end
+      
+      feed.active = true
+      feed.save
+
       GoogleAnalyticsEvent.track_session_duration(self)
       GoogleAnalyticsEvent.track_band_real_session(self) 
     end

ruby/lib/jam_ruby/models/music_session.rb

@@ -74,7 +74,6 @@ module JamRuby
     def add_to_feed
       feed = Feed.new
       feed.music_session = self
-      feed.active = true
     end