updated menu items
Merge remote-tracking branch 'origin/mark'

Conflicts:
	includes/menu_inc.php