Copy để merge
Merge branch 'master' of https://github.com/vnCreature/vnCreature

Conflicts:
	vnCreatures/src/com/example/vncreatures/common/ServerConfig.java
Update map diagram