Solucion problemas paciente / consulta
Merge origin/master

Conflicts:
	application/views/profesional/index.php