Added basic categories and locations to seeds
Merge remote-tracking branch 'origin/master'