fix merge conflict with category index view
Merge branch 'development' of https://github.com/elliotec/codeunion into development