update to provide socket provider
Merge branch 'master' of github.com:UWNetworksLab/UProxy

Conflicts:
	chrome/extension/app/submodules/oauth2