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

Conflicts:
	frontend/controllers/CreaturesController.php