Proxy setup
added elastic beanstalk config
Add elastic beanstalk config
Merge branch 'dev'