Merge pull request #36 from SiddharthManoj/master

Fixed friend list issues