Feature #41, added category to feed content syndication
Merge branch 'feature-41' into develop
Merge branch 'develop'