prova riccardo
prova
Merge branch 'master' of https://github.com/stefanostatuti/siviaggiare

Conflicts:
	siviaggiare/includes/config.inc.php