update

Signed-off-by: luuvn <luu@vn.vl>
Merge branch 'master' of https://github.com/vnCreature/vnCreature

Conflicts:
	vnCreatures/src/com/example/vncreatures/controller/ThreadFragment.java

Signed-off-by: luuvn <luu@vn.vl>