added info guides to search results, renamed activies in res
merge conflicts fixed