waiting for pagination from @AG
Merge branch 'feature/friends' into develop