Add possibility to use a proxy server
Merge branch 'ybonnel-Proxy'