Merge pull request #50 from SimonHietala/master

Friendships
added get_friends_list wraper function to make code more clear
Merge pull request #51 from Gegga87/master

added get_friends_list wraper function to make code more clear
implemented correct error messages for login and registration. Added error_code for internal protocol errors to handle errors rather than just pass a message describing the error
Merge remote-tracking branch 'upstream/master'
Merge pull request #52 from ahlen/master

implemented correct error messages for login and registration. Added err...
added some info to services/lobby/__init__.py
Merge branch 'master' of github.com:quizzingbricks/quizzingbricks-core
fixed some parts related to the friends service
__init.py__ i lobby
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