Merge branch 'dev' into feature/scores

Conflicts:
	teleforma/models/core.py
	teleforma/templates/postman/view.html

diff --cc teleforma/models/core.py
index 1b6fa82b470a594a0dd8bab10962ae15eee81221,2fbf489f98921bdc0214ed10d782a3eda86c7bbd..0a52f806320e548c6df2027248dc0db66f8b084f
--- 1/teleforma/models/core.py
--- 2/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@@ -151,19 -151,18 +151,18 @@@ class CourseType(Model)
  
  class Course(Model):
  
 -    department      = ForeignKey('Department', related_name='course',
 +    department      = models.ForeignKey('Department', related_name='course',
                                   verbose_name=_('department'))
 -    title           = CharField(_('title'), max_length=255)
 -    description     = CharField(_('description'), max_length=255, blank=True)
 -    code            = CharField(_('code'), max_length=255)
 -    title_tweeter   = CharField(_('tweeter title'), max_length=255)
 -    date_modified   = DateTimeField(_('date modified'), auto_now=True, null=True)
 -    number          = IntegerField(_('number'), blank=True, null=True)
 -    synthesis_note  = BooleanField(_('synthesis note'))
 -    obligation      = BooleanField(_('obligations'))
 -    magistral       = BooleanField(_('magistral'))
 +    title           = models.CharField(_('title'), max_length=255)
 +    description     = models.CharField(_('description'), max_length=255, blank=True)
 +    code            = models.CharField(_('code'), max_length=255)
 +    title_tweeter   = models.CharField(_('tweeter title'), max_length=255)
 +    date_modified   = models.DateTimeField(_('date modified'), auto_now=True, null=True)
 +    number          = models.IntegerField(_('number'), blank=True, null=True)
 +    synthesis_note  = models.BooleanField(_('synthesis note'))
 +    obligation      = models.BooleanField(_('obligations'))
 +    magistral       = models.BooleanField(_('magistral'))
  
- 
      def __unicode__(self):
          return self.title
  

diff --cc teleforma/templates/postman/view.html
Simple merge