Updated machado.
Created SearchResponse content type.
Resolved merge conflicts.