friendList
merge conflicts
Merge pull request #6 from vasanthykolluri/akash

Akash
Merge remote-tracking branch 'origin/master' into vasanthy
Merge pull request #7 from vasanthykolluri/vasanthy

Fixing msg
Merge remote-tracking branch 'origin/master' into vasanthy
Fixing upload pic, adding Group,GroupPics activity