Arreglado bug de max 50 caracteres en preguntas
 Fix Bug de 50 char max
Validacion de logica en el back
Historia geofield
Merge branch 'Dual2' of https://github.com/trea-uy/django-survey/ into Dual2
fgfdfdsfsddfd
casi pronto lo del  captcha
node modules of karma added
cosas de cpatcha
captcha listo
Merge branch 'Dual2Captcha' into Django-CMS

Conflicts:
	TreaProject/dynamicForms/fieldtypes/GeoField.py
	TreaProject/dynamicForms/static/js/editorCtrl.js
	TreaProject/dynamicForms/static/js/fields/FieldFactory.js
	TreaProject/dynamicForms/static/js/visorCtrl.js
	TreaProject/dynamicForms/templates/editor.html
	TreaProject/dynamicForms/templates/fields/geolocation/template_edit.html
	TreaProject/dynamicForms/templates/mainPage.html
	TreaProject/dynamicForms/templates/visor.html
	inefop/inefop/settings.py