Merge origin/master

Conflicts:
	protected/models/Medico.php
Merge origin/master