Changes
Merge branch 'master' of https://github.com/openpeer/opbb10

Conflicts:
	samples/opbbcsampleapp/src/rootPane.cpp
Merge branch 'master' of https://github.com/openpeer/opbb10
Contacts showing - but all of them.