file agregado.
Falta corregir el tema de recuperar el archivo una vez guardado.
to be continued...
sfasfdsa
fs
fad
Cambio clase de archivo en modelo
rfes
Merge branch 'Captcha' of https://github.com/trea-uy/django-survey into Captcha
ryer
bdzf
file running
Merge branch 'Django-CMS' into fileIntegrationCMS

Conflicts:
	TreaProject/dynamicForms/models.py
	TreaProject/dynamicForms/static/js/fields/FieldFactory.js
	TreaProject/dynamicForms/static/js/visorCtrl.js
	TreaProject/dynamicForms/templates/editor.html
fa
Merge branch 'fileIntegrationCMS' into Django-CMS

Conflicts:
	TreaProject/dynamicForms/serializers.py
	TreaProject/dynamicForms/static/js/appVisor.js
	TreaProject/dynamicForms/static/js/visorCtrl.js
	TreaProject/dynamicForms/templates/responses.html
	TreaProject/dynamicForms/templates/visor.html
	TreaProject/dynamicForms/urls.py
	TreaProject/dynamicForms/views.py
f
file working
Merge branch 'Django-CMS' of https://github.com/trea-uy/django-survey
into Django-CMS

Conflicts:
	TreaProject/dynamicForms/views.py