Merge remote-tracking branch 'upstream/master'
fixed some parts related to the friends service
Merge remote-tracking branch 'upstream/master'
merging
Merge branch 'master' of git://github.com/quizzingbricks/quizzingbricks-core
Merge pull request #54 from ahlen/master

fixed some smaller parts related to the friends service