functions2
Resolucion

Conflicts:
	functions.php
Merge branch 'master' into luis
debug gmaps