act setup
vvh
Merge branch 'Django-CMS' of
https://github.com/trea-uy/django-survey.git into Django-CMS

Conflicts:
	TreaProject/dynamicForms/static/js/fields/TextField.js