add Categories, Tags
Merge branch 'master' of https://github.com/zmeii85/DjangoBlog