Merge arreglos de Santiago a CMS
Merge branch 'Django-CMS' of https://github.com/trea-uy/django-survey/ into Django-CMS