Friends Fix

Re-pushed the friends requirement.
Merge branch 'master' of https://github.com/ECSE428Group/media-stream