action to ZoomIn and ZoomOut
Inert Image activated
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mainwindow.cpp
	mainwindow.h