Merge branch 'Desarrollo2'
Merge branch 'master' into desarrollo
validando descuento null
Merge branch 'desarrollo' of https://github.com/MarioASM/sysMqr into desarrollo
cache
Merge branch 'Desarrollo2' into desarrollo

Conflicts:
	app/Controller/RentsController.php
Merge pull request #14 from MarioASM/desarrollo

MAster a desarrollo original