Cambios
Merge branch 'master' of github.com:m1k3777/final_dif

Conflicts:
	protected/models/Inventario.php