adding friendship filters to activity and users and relevant links
Fixing after merge with develop