geofield + bug resolved estadistica checkbox
Merge branch 'GeoField' into Django-CMS

Conflicts:
	TreaProject/dynamicForms/static/js/editorCtrl.js
	TreaProject/dynamicForms/templates/editor.html
	inefop/inefop/settings.py