merge
Merge branch 'Django-CMS' of https://github.com/trea-uy/django-survey.git into Django-CMS
middlet en settings
Merge branch 'Django-CMS' of https://github.com/trea-uy/django-survey.git into Django-CMS