Merge branch 'master' into locations
Merge branch 'locations' of github.com:digitalmethodsinitiative/dmi-tcat into locations
updated documentation
Merge branch 'locations' of github.com:digitalmethodsinitiative/dmi-tcat into locations