Edit menu
Merge branch 'hotfix'

Conflicts:
	protected/views/layouts/main.php