ya anda cerrar fase si n decorators aun
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/gdc/forms.py
	pmm_is2/apps/gdc/models.py
	pmm_is2/apps/gdc/urls.py
	pmm_is2/apps/gdc/views.py
	pmm_is2/templates/adm/adm_base_logged.html
	pmm_is2/templates/des/des_base_logged.html
	pmm_is2/templates/gdc/gdc_base_logged.html
	pmm_is2/templates/gdc/index.html
	pmm_is2/templates/pmm_is2/base_logged.html
ya anda cerrar fase si n decorators aun