Adds a clb model diagram and fixes the search-ws merge in both the client code, jersey resources and integration tests