Document search, work in progress
Merge branch 'document-search' into dev