Added http and https proxy support
Merge branch 'proxy-support' into develop

Adding true support for HTTP and HTTPS proxies