Added search merged with develop
Search file merged with develop
Fix tests
Changed tests in order to merge with develop
Change resource id to string in stream_tests
Merge pull request #61 from projectcs13/Sp4.Sc1.Searchimplementation.2

Sp4.sc1.searchimplementation.2