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

Conflicts:
	gameshunter/src/main/webapp/WEB-INF/content/cadastrar-usuario.jsp