Critical bug. Profesional responsible.
Merge branch 'master' of https://github.com/gestorpsi/gestorpsi

Conflicts:
	gestorpsi/organization/views.py