Modifications that syncronize several previously merged branches

• Fixed errors that arose from merging errors
• Added feedback to mock data so student page works
• Student serializer now only send necessary submission info on initial load

core/tests/test_student_page.py

@@ -190,21 +190,16 @@ class StudentSelfSubmissionsTests(APITestCase):
             self.submission_list_first_entry['type']['solution'],
             self.student_info.submissions.first().type.solution)
 
-    def test_submission_data_contains_text(self):
+    def test_submission_data_contains_final_status(self):
         self.assertEqual(
-            self.submission_list_first_entry['text'],
-            self.student_info.submissions.first().text)
+            self.submission_list_first_entry['feedback']['isFinal'],
+            self.student_info.submissions.first().feedback.is_final)
 
     def test_submission_data_contains_feedback_score(self):
         self.assertEqual(
             self.submission_list_first_entry['feedback']['score'],
             self.student_info.submissions.first().feedback.score)
 
-    def test_submission_data_contains_feedback_text(self):
-        self.assertEqual(
-            self.submission_list_first_entry['feedback']['text'],
-            self.student_info.submissions.first().feedback.text)
-
     # We don't want a matriculation number here
     def test_matriculation_number_is_not_send(self):
         self.assertNotIn('matrikel_no', self.submission_list_first_entry)