Changed identity API again to rename fields
Merge branch 'master' of https://github.com/UWNetworksLab/freedom