Unified reposetup/reposync, updated main menu

Conflicts:
	menu/reposetup