Updated find method to search both properties and associations.
Merge remote-tracking branch 'origin/searchFeature' into searchFeature
Completed implementation of search functionality on the resource managers.