Feature/elasticsearch v3

see commit messages