Categories and Items can be viewed in its respected fragments
Merge branch 'develop'