Updates to identity API
Merge branch 'master' of https://github.com/UWNetworksLab/freedom into HEAD