categories should be stored in database
Merge remote-tracking branch 'origin/master'