Today's changes on the RavenFS branch.

We fixed more issues caused by merge and started working on search layout.