full-text search testing
Merge branch 'master' into search
adding full-text search