Merge pull request #24 from ahlen/master

Merge remote-tracking branch 'upstream/master'
started adding friends.proto TODO: figure out how to send lists over protocol buffers
Merge pull request #25 from Gegga87/master

started adding friends.proto TODO: figure out how to send lists over pro...
get_friends_list returns hardcoded list of friends
Merge pull request #26 from Gegga87/master

get_friends_list returns hardcoded list of friends
Initial commit
Changed the game process to parse the first frame of each message as string, added a client for the game process that doesn't use json
added a test client for the game process to check that messaging works
Added python protocols and test client to show that the game process works
Merge branch 'master' of https://github.com/petotr-1/quizzingbricks-core
Merge pull request #27 from petotr-1/master

Game process pull request
Changed the protocol a little
Changed the internal game protocol to fit webapi reqs, made untested web api stub
Merge pull request #28 from petotr-1/master

Changed the internal game protocol slightly to better fit webapi reqs, made (untested) web api stub
Friends List on web and friendsservice with option to add and remove friends added in backend only dummy in backend so far though
resolving conflict
Merge pull request #29 from Gegga87/master

Friends List on web and friendsservice with option to add and remove fri...
Register form

Better bootstraping of the registrating form.
Merge pull request #30 from SimonHietala/master

Register form
added userId to addfriendrequest and removefriendrequest