elasticSearch jar
major redesign based on elasticsearch
resolved conflicts