Merge pull request #17 from JohnCny/master

merge
Merge pull request #18 from JohnCny/master

merge
url被覆盖了
Merge pull request #49 from tanwh/master

修改菜单结构