Merge branch 'master' of https://github.com/Danny182/Fantacalcio

Conflicts:
	crea_squadra/crea-squadra.php