Integrato in unico file mappa e creazione json
Merge branch 'master' of https://github.com/piersoft/mappaosmacqualta

Conflicts:
	mappacqualta.html
Delete html file
update
Merge branch 'master' of https://github.com/piersoft/mappaosmacqualta

Conflicts:
	mappacqualta.php