Renamed category to views
Merge branch 'bug-18069-rename-candystore'