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

Conflicts:
	TreaProject/dynamicForms/static/js/responsesCtrl.js