Server Protocol
Merge branch 'master' of https://github.com/komelio/coko-ticket

Conflicts:
	common/pom.xml
po