Merge branch 'fix_name'

Conflicts:
	controller/admin/MenuController.php