Merge origin/master

Conflicts:
	protected/models/Medico.php
	protected/models/Tipoagenda.php
	protected/views/agenda/view.php
	protected/views/layouts/main.php
	protected/views/tipoagenda/create.php
Merge origin/master