Adding names to identity provider
Merge branch 'master' of https://github.com/UWNetworksLab/uproxy-common into HEAD

Conflicts:
	uproxy.js