commit check link ảnh
Merge branch 'master' of https://github.com/vnCreature/vnCreature

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