Fix protocol definitions
Merge branch 'define-protocols' into change-model
Add compiled Server protocol
Merge remote-tracking branch 'origin/define-protocols' into change-model

Conflicts:
	protocols/server.proto
new branch (?)