Merge "Add elasticsearch container and nginx proxy"