Load categories from database, database dump
Add dump
Merge remote-tracking branch 'origin/master'