commit before synch
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProgettoPDS_CLIENT.v11.suo