Fixed
Merge branch 'Estadistica' of https://github.com/trea-uy/django-survey
into Estadistica

Conflicts:
	TreaProject/dynamicForms/views.py