bean
Merge branch 'master' of git@github.com:666888/zero.git

Conflicts:
	src/main/java/deep/zero/bean/Player.java