Add SOCKS support
Merge branch 'certpinning' into socks

Conflicts:
	Vendor/CocoaAsyncSocket
updated CocoaAsyncSocket
Removed hard wiring of proxy socket
update async proxy
Merge branch 'release' into socks

Conflicts:
	Vendor/CocoaAsyncSocket
Merge remote-tracking branch 'origin/socks' into socks

Conflicts:
	Vendor/CocoaAsyncSocket
fix authentication method choice