Merge remote-tracking branch 'upstream/master'
Friends list - Fixed an issue with names apostrophes
Merge pull request #186 from Ziggeh/master

Friends list - names containing apostrophes