Bibis Menu first try.
Merge remote-tracking branch 'origin/master'

Conflicts:
	qml/Main.qml