Update elasticsearch helper
Merge branch 'elasticsearch' into dev
Update package.json