Merge branch 'feature/aws'
use nginx proxied es
Merge branch 'feature/proxy-es'