pagina de pacientes
s
vistas
Merge remote-tracking branch 'origin/master'

Conflicts:
	clinic/appointment/__init__.pyc
	clinic/appointment/admin.pyc
	clinic/appointment/models.pyc
	clinic/clinic/__init__.pyc
	clinic/clinic/settings.pyc
	clinic/clinic/urls.pyc
	clinic/clinic/views.pyc
	clinic/clinic/wsgi.pyc
	clinic/consultation/__init__.pyc
	clinic/consultation/admin.pyc
	clinic/consultation/models.py
	clinic/consultation/models.pyc
	clinic/consultation/urls.pyc
	clinic/consultation/views.pyc
	clinic/patient/__init__.pyc
	clinic/patient/admin.pyc
	clinic/patient/models.pyc
	clinic/patient/urls.pyc
	clinic/patient/views.pyc
	clinic/prescription/__init__.pyc
	clinic/prescription/admin.pyc
	clinic/prescription/models.pyc
	clinic/profiles/__init__.pyc
	clinic/profiles/admin.pyc
	clinic/profiles/models.pyc
	clinic/profiles/urls.pyc
	clinic/profiles/views.pyc