ACTUALIZACION-Se ha cambiado la configuración

Se han movido algunas funcionalidades a otros módulos
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinic/clinic/urls.pyc
	clinic/profiles/admin.pyc
	clinic/profiles/models.pyc
	clinic/profiles/urls.pyc
	clinic/profiles/views.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinic/clinic/urls.pyc
	clinic/profiles/admin.pyc
	clinic/profiles/models.pyc
	clinic/profiles/urls.pyc
	clinic/profiles/views.pyc