Merge origin/master

Conflicts:
	verificarAtaques.sh