fix
fixed mergeconflict and some querries
Merge pull request #68 from scalableinternetservices/search

Search