update
Merge branch 'master' of https://github.com/rotherford/Proxyfier

Conflicts:
	Proxyfier/Model/ProxyListFetcher.m