nove menu, test farieb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Appka/Appka.iml