added basic Elastic Search functionality
Merge branch 'elasticSearch' into develop

* elasticSearch:
  added basic Elastic Search functionality