Merge branch 'qatang-dev'
enable、disnable方法合并为validate方法
Merge branch 'master' of https://github.com/JSHgithub/cms
fix user
fix bug
merge jsh
Merge branch 'jsh-master'
fix bug
Merge pull request #23 from chirowong/master

201412262