Merge 1.0.1

smash/web/tests/models/test_mail_template.py

@@ -106,7 +106,7 @@ class MailTemplateModelTests(TestCase):
         worker_name = str(self.user.worker)
 
         self.check_doc_contains(doc, [worker_name, str(subject), str(subject.subject.country), subject.nd_number,
-                                      subject.get_type_display()])
+                                      subject.type.name])
 
     def test_apply_subject_with_non_existing_custom_field(self):
         subject = create_study_subject()