Merge in update to friendshow view
Merge from master