code cleanup - friends section
code cleanup
Merge remote-tracking branch 'origin/development' into video-recording