Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/teleforma into dev

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

diff --cc teleforma/management/commands/teleforma-import-conferences.py
index 1025092c361ccf47023c0b36b0c52ae2b6059280,3cc8a162bc96c43ed3e6e5e6aad9819eb777dd6b..ccdd689f3a9b1b32e60d3dfcb987767345374b87
--- 1/teleforma/management/commands/teleforma-import-conferences.py
--- 2/teleforma/management/commands/teleforma-import-conferences.py
+++ b/teleforma/management/commands/teleforma-import-conferences.py
@@@ -52,8 -43,14 +52,19 @@@ class Command(BaseCommand)
          all_conferences = Conference.objects.all()
          i = 1
  
++<<<<<<< HEAD
 +      self.cleanup()
 +              
++=======
+         #FIXME:
+         medias = Media.objects.all()
+         for media in medias:
+             media.delete()
+         items = MediaItem.objects.all()
+         for item in items:
+             item.delete()
+ 
++>>>>>>> 278a443740c34a129f84eb61a443b547a678cb48
          for root, dirs, files in os.walk(self.media_dir):
              for filename in files:
                  name = os.path.splitext(filename)[0]