Update code và diagram
Merge branch 'master' of https://github.com/vnCreature/vnCreature

Conflicts:
	vnCreatures/res/values/strings.xml
	vnCreatures/src/com/example/vncreatures/common/ServerConfig.java
	vnCreatures/src/com/example/vncreatures/controller/MapCreatureActivity.java