f
e
f
j
rw
Merge branch 'nuevosCamposYsaveForm' of
https://github.com/trea-uy/django-survey into nuevosCamposYsaveForm

Conflicts:
	TreaProject/dynamicForms/static/js/editorCtrl.js
dfjdskfjsd
Agregado campos null para DB y relacion entre Versiones y respuestas
Merge branch 'devel2.0' of https://github.com/trea-uy/django-survey into devel2.0