Fixed #268
Merge branch 'master' into new_milestone
Merge branch 'new_milestone' of https://github.com/Kooboo/CMS into new_milestone