Template database & improvements
Merge branch 'master' of https://github.com/tuur29/cms
article editor