Se agrega:
	- inicio generar reporte2
Merge origin/master

Conflicts:
	protected/controllers/CentroMedicoController.php