Added proxy server stuff
fixed merge conflicts