fast fix
Merge remote-tracking branch 'pacman/master2' into test2

Conflicts:
	src/view/MenuBarItem.java
	src/view/MenuTabItem.java