Merge origin/master

Conflicts:
	app/modelos/carrito.php
	nucleo/Clase_base.php