ASD
Merge branch 'master' of https://github.com/CroceRossaCatania/gaia

Conflicts:
	core/class/GeoPolitica.php