implementazione zoom pan box
Merge branch 'master' of https://github.com/spium/progetto-cv.git

Conflicts:
	ProgettoCV/.classpath