fix unit test problem.
Merge remote-tracking branch 'origin/master'
entity search
fix merge bug;
entity search.
Merge pull request #172 from forumbyr/master

fix merge bug; entity search.