working on mouse zoom
Merge remote-tracking branch 'origin/master' into master-mischa

Conflicts:
	src/main/java/ch/bfh/ti/jts/gui/Window.java
zooming issue, partially solved
zooming working