Merge pull request #4 from qatang/dev

merge
Merge pull request #1 from qatang/dev

Dev
菜单管理的增删改查
Revert "菜单管理的增删改查"

This reverts commit 41f4eafc9b378d0440cf071642c32a4a564a9fd2.
Revert "Revert "菜单管理的增删改查""

This reverts commit ca8bda321e58066d3a43b82c6b5847bebda0418b.
菜单管理更改提交
角色更新
Merge pull request #18 from zzqjava/master

更新20140610
Merge pull request #17 from likunpeng06/master

菜单管理
Merge pull request #16 from JSHgithub/master

update
Merge pull request #2 from qatang/dev

Dev
add EnableDisableStatus
表
paging form
Merge pull request #29 from likunpeng06/master

表
Merge branch 'dev' of https://github.com/qatang/cms into dev
Merge pull request #6 from qatang/dev

merge Dev