Push pós merge :x
Merge branch 'master' of https://github.com/ylhaeri/gameshunter.git

Conflicts:
	gameshunter/Pais.txt
	gameshunter/src/main/java/br/com/gameshunter/DAO/EstadoDAO.java
	gameshunter/src/test/java/br/com/gameshunter/DAO/InsercaoEnderecoDAOTest.java