menubar bla und so
Merge branch 'master' of https://github.com/glisur/ImageEditor

Conflicts:
	ImageEditorFrame.java