Agregando activarCuenta
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/seguridad.css
	js/common-logic.js