cambios
Merge branch 'devel2.0' of https://github.com/trea-uy/django-survey into devel2.0