Add menu manager
Change thei branch to say branch
Add changes
Master change
Merge branch 'menumgr'

Conflicts:
	menumanager.php