so many things (1.8.7 friendly not broken deployable app)

#TODO map is broken
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