minor modifications to make the names for two new geo-resource types consistent
Merge branch 'DecRelease' of https://github.com/hydroshare/hydroshare into DecRelease