fixed generic resource
Merge branch 'master' of https://github.com/hydroshare/hs_core into HEAD
coded access control into the generic resource