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
Merge pull request #55 from Gegga87/master

smaller changes to game_board.html/js to start working on communication ...
Merge pull request #56 from Gegga87/master

JS function to assign colors to the different players userId
Merge pull request #57 from Gegga87/master

drawBoard JS function added
changed .proto to return User instead of emails as string in friends and lobbies