Added new gui to proxies.
Merge remote-tracking branch 'origin/master'