enhancements to friends popup
Merge branch 'master' into development_l