Display fb friends from current organization only
Merge branch 'MH-587' into dev