Merge branch 'master' of https://github.com/Kooboo/CMS
Merge branch 'master' of https://github.com/Kooboo/CMS
Additional changes for issue #1
Merge pull request #36 from kooboo-jifeng/master

Additional changes for issue #1