Updated menu
Merge remote-tracking branch 'github/devel' into devel

Conflicts:
	index.html