fixed bug in view pending friends branch
added code conventions and fixed some error
added missing code conventions
solved incorrect indentation
resolved conflicts
Merge pull request #355 from yousraHazem/bug_view_pending_friends

fixed bug in view pending friends branch