Basic search implemented
Merge branch 'dev_tableview'