Add ElasticSearch
Add searching
Merge branch 'add-elasticsearch'