Merge conflicts

api/serializers.py

@@ -491,6 +491,7 @@ class MessageSerializer(serializers.ModelSerializer):
             'body',
         )
 
+
 class ShowSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Show
+        model = Show

api/views.py

@@ -26,6 +26,7 @@ from spa.models.show import Show
 from spa.models.mix import Mix
 from spa.models.comment import Comment
 from spa.models.notification import Notification
+from spa.models.show import Show
 from spa.models.userprofile import UserProfile
 
 logger = logging.getLogger('spa')