Changed ids on friends so they went to the correct page
Merge branch 'development' into ltest
working on friend details