Merge origin/Antigo into Antigo

Conflicts:
	WorldCupStatsWeb/WorldCupStats/src/java/hibernate.cfg.xml
Merge origin/Antigo into Antigo