Merge branch 'dev' into prestashop

Conflicts:
	requirements-dev.txt

diff --cc app/local_settings.py
Simple merge

diff --cc app/organization/core/management/commands/festival-sync-eve-events.py
index 070cadbd068c06b7efbb51c67322e1811c0c5c3e,070cadbd068c06b7efbb51c67322e1811c0c5c3e..9ece332cc3f7faafb69dc203eb79d13595844211
--- 1/app/organization/core/management/commands/festival-sync-eve-events.py
--- 2/app/organization/core/management/commands/festival-sync-eve-events.py
+++ b/app/organization/core/management/commands/festival-sync-eve-events.py
@@@ -23,6 -23,6 +23,7 @@@ class Command(BaseCommand)
            )
  
      default_user = User.objects.get(username='admin')
++    
  
      def cleanup(self):
          # for event in ma_models.Event.objects.all():

diff --cc app/settings.py
Simple merge