Updating excel upload to create categories
Merge branch 'parent-deployment' into parent-master
Working on categories, multi-edit

Category wasn't being created during import, fixed.
Updated type field in locations to be resource_type
Got multi-edit/approve/delete working