modi2
Merge remote-tracking branch 'origin/master'
added friends view to main view