Merge branch 'Devel4.0' into integracionRefactoring

Conflicts:
	TreaProject/dynamicForms/serializers.py
JSONSerializer
field class validation
Correccion url statistic
Merge branch 'integracionRefactoring' into Devel4.0

Conflicts:
	TreaProject/dynamicForms/serializers.py
Merge branch 'Devel4.0' of https://github.com/trea-uy/django-survey into Devel4.0