Category controller - only prove that works 2
Merge remote-tracking branch 'origin/master'