UserInfo primary email and phone
userinfo primary
Merge branch 'master' of https://github.com/FityFity/UBO

Conflicts:
	lda/lda-clientlib