Merge pull request #7 from xiaojue/master

git pull request
Merge branch 'dev' of https://github.com/xiaojue/jbcms into dev
add ns
Merge pull request #8 from xiaojue/dev

Dev