Fully commited everything
Merge branch 'master' of https://github.com/FakeYou/kratos
Merge branch 'master' of https://github.com/FakeYou/kratos

Conflicts:
	lobby/pom.xml
	lobby/src/main/java/org/kratos/lobby/Lobby.java