Lol al extremo
lol extremo
Merge branch 'master'

Conflicts:
	php/catalogoFunctions.php