MergeConflict resolved

Conflicts:
	SceneMenu.py