Actualizacion del modulo cartera
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	modulos/cartera/cartera42.php
Actualizacion general de full10