Merge origin/master

Conflicts:
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Escalacao.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Gol.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Jogador.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Jogo.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Selecao.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Substituicao.java
	WorldCupStatsWeb/WorldCupStats/src/java/model/pojo/Tecnico.java