ready
Merge branch 'master' of https://github.com/ylhaeri/gameshunter.git

Conflicts:
	gameshunter/src/main/java/br/com/gameshunter/action/EstadoAction.java