Elastic search

merging elastic_search branch into master