Quick search

Merging Quick_Search user story with master version