zoom in zoom out
Merge develop_3

Conflicts:
	src/cz/cvut/fit/project/noted/toolbars/Toolbar.java