manually re-adding friends filters changes after merge issue
Merge branch 'Testing_Release_1.0' into Liam