Chinh
Merge branch 'master' of https://github.com/vnCreature/website

Conflicts:
	backend/views/creatures/admin.php