Update menu.py
Update menu.py
Merge branch 'master' into beta

Conflicts:
	pimame_files/menu.py