friends feature restored
Merge branch 'feature-friends-restored' into develop