Label and template changes.
Merge branch 'master' of https://github.com/Kooboo/CMS