Cambio Controlador Rentas a Equipos
Merge branch 'master' of https://github.com/OsvaldoO/xnet

Conflicts:
	protected/controllers/RentasController.php
	protected/models/RentaForm.php