Merge remote-tracking branch 'upstream/search' into search
fixing the search input field
Merge remote-tracking branch 'upstream/master'
Merge pull request #169 from vadhawal/master

fixing the search input field