duas linhas iguais no mapaState
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/View/States/MapaState.class