Updated SW version to have correct bindings for new services.  Note that the combined entity search page is not hooked up to a working DAO/report populator, just a stub to get things working.
Merge branch 'master' into 4.1.0