Merge remote-tracking branch 'upstream/master'
fixed some parts related to the friends service
Merge remote-tracking branch 'upstream/master'
Merge pull request #53 from Gurr3/master

added some info to services/lobby/__init__.py
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
smaller changes to game_board.html/js to start working on communication with game backend
Merge pull request #55 from Gegga87/master

smaller changes to game_board.html/js to start working on communication ...
JS function to assign colors to the different players userId
Merge pull request #56 from Gegga87/master

JS function to assign colors to the different players userId
drawBoard JS function added
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
Merge pull request #58 from Gegga87/master

changed .proto to return User instead of emails as string in friends and...
Changed so friendslist return user instead of email
Merge pull request #59 from SimonHietala/master

Changed so friendslist return user instead of email
added Lobby message and LobbyMembership
Merge pull request #60 from Gegga87/master

added Lobby message and LobbyMembership
sync with master