medico usuario
Merge origin/master

Conflicts:
	protected/models/Dia.php
	protected/models/Medico.php
	protected/views/dia/_view.php
	protected/views/dia/admin.php