Merge+Fix merge conflicts

partners/constants.py

@@ -32,7 +32,7 @@ PROSPECTIVE_PARTNER_STATUS = (
 )
 
 PROSPECTIVE_PARTNER_EVENT_REQUESTED = 'requested'
-PROSPECTIVE_PARTNER_EVENT_COMMENT = 'comment',
+PROSPECTIVE_PARTNER_EVENT_COMMENT = 'comment'
 PROSPECTIVE_PARTNER_EVENT_EMAIL_SENT = 'email_sent'
 PROSPECTIVE_PARTNER_EVENT_INITIATE_NEGOTIATION = 'negotiating'
 PROSPECTIVE_PARTNER_EVENT_MARKED_AS_UNINTERESTED = 'marked_as_uninterested'

partners/models.py

@@ -85,6 +85,7 @@ class ProspectivePartnerEvent(models.Model):
     def __str__(self):
         return '%s: %s' % (self.prospartner, self.get_event_display())
 
+
 ###########################
 # Partner-related objects #
 ###########################