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