User identity stuff mostly.
Merge branch 'master' of https://github.com/openpeer/opbb10

Conflicts:
	samples/opbbcsampleapp/arm/Makefile
	samples/opbbcsampleapp/arm/Makefile.Debug
	samples/opbbcsampleapp/arm/Makefile.Release