Merge commit '01361983136f137361280f21fc37dc25ab9a4407' into Code_cleanup
2bb84fc28af2c492b071f.

Conflicts:
	VocaluxeLib/Menu/IMenu.cs