Varios
Merge remote-tracking branch 'origin/master'

Conflicts:
	AGO/js/Metodos.js