Converted category manager views to CBVs
Merge location and category cbv changes