添加菜单
Merge branch 'master' of github.com:zhulin3141/focus

Conflicts:
	admin/js/admin.js
	admin/menu.php
	controller/admin/MenuController.php