CHinh, ngày 3/12
Merge branch 'master' of https://github.com/vnCreature/website
CHinh commit 3/13
Merge branch 'master' of https://github.com/vnCreature/website

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	protected/config/main.php
Merge branch 'master' of https://github.com/vnCreature/website