Fixed update script in node-xmpp
Adding meta identity provider template (just loopback for now)
Merge branch 'master' of https://github.com/UWNetworksLab/uproxy-common

Conflicts:
	uproxy.json