Merge pull request #2 from MorganDawe/7.x.cwrcps-4

Adding files for code review.
Merge pull request #3 from discoverygarden/7.x.cwrcps-4

7.x.cwrcps 4
Fixed an issue preventing local entity searching.