Parking - Person
Merge origin/master

Conflicts:
	Progetti Java/SceneGenerator/src/MenuPannello.java
Merge origin/master

Conflicts:
	Progetti Java/SceneGenerator/src/MenuPannello.java
update
Merge branch 'master' of https://github.com/gianitobia/Esercizi-clips

Conflicts:
	Progetti Java/SceneGenerator/nbproject/project.properties