Merge branch 'master' of /home/daas/PycharmProjects/pmm-is2 with conflicts.
ya anda crear proyecto con fase
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/adm/forms.py
	pmm_is2/apps/adm/models.py
	pmm_is2/apps/adm/views.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	pmm_is2/apps/adm/forms.py
	pmm_is2/apps/adm/models.py
	pmm_is2/apps/adm/views.py