Merge branch 'dev' of /var/git/teleforma into dev

Conflicts:
	teleforma/management/commands/teleforma-copy-conferences.py

diff --cc teleforma/management/commands/teleforma-copy-conferences.py
index 463cee85389b2e502c077ea16ba1092b0d155858,e51b314219a412ee4e0d8f2761aab70a9708b872..0940482af0e6919eb146da80c590dd6e74170e7a
--- 1/teleforma/management/commands/teleforma-copy-conferences.py
--- 2/teleforma/management/commands/teleforma-copy-conferences.py
+++ b/teleforma/management/commands/teleforma-copy-conferences.py
@@@ -28,15 -26,17 +28,18 @@@ class Logger
  class Command(BaseCommand):
      help = "Copy conferences from one period to another"
      courses = ['OB','PAC','PC','PP','DA','Affaires','DIE','Civil','Penal','Social']
 -    period_1_name = 'Semestrielle'
 -    period_2_name = 'Pré-Estivale'
 +    period_1_name = u'Semestrielle'
 +    period_2_name = u'Pré-Estivale'
+     course_type = 'Cours'
  
      def handle(self, *args, **options):
          period_1 = Period.objects.get(name=self.period_1_name)
          period_2 = Period.objects.get(name=self.period_2_name)
 -        course_type = CourseType.objects.get(name=course_type)
++        course_type = CourseType.objects.get(name=self.course_type)
+ 
 -        for course in self.courses:
 -            medias = Media.objects.filter(period=period_1, course=course, type=course_type)
 +        for course_code in self.courses:
 +            course = Course.objects.get(code=course_code)
-             medias = Media.objects.filter(period=period_1, course=course)
++            medias = Media.objects.filter(period=period_1, course=course, course_type=course_type)
              for media in medias:
                  media.pk = None
                  media.save()