aplicando permiso acceso desarrollo
Merge branch 'rodrigo' into alexis

Conflicts:
	.idea/workspace.xml
	SGP/__init__.pyc
	SGP/settings.pyc
	SGP/urls.pyc
	SGP/wsgi.pyc
	administracion/__init__.pyc
	administracion/admin.pyc
	administracion/forms.pyc
	administracion/models.pyc
	administracion/views.pyc
	desarrollo/__init__.pyc
	desarrollo/admin.pyc
	desarrollo/forms.pyc
	desarrollo/models.pyc
	desarrollo/views.pyc
	sesion/__init__.pyc
	sesion/admin.pyc
	sesion/forms.pyc
	sesion/models.pyc
	sesion/views.pyc