ripristinata versione win7
Merge branch 'master' of https://github.com/pollanz74/WorkProjects.git

Conflicts:
	batch-monitor/.classpath