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

Conflicts:
	frontend/views/creatures/index.php
	frontend/www/css/custom.css