Merge branch 'develop' of github.com:praekelt/unicore-cms into feature/issue-5-start-cms-admin
fix validation for category
Merge branch 'develop' of github.com:praekelt/unicore-cms into feature/issue-5-start-cms-admin
add editing of categories
Merge branch 'develop' of github.com:praekelt/unicore-cms into develop