Just test
Merge branch 'master' into tuanduong
Change style for registration form
Merge branch 'master' into minhtrieu

Conflicts:
	src/application/views/user/register.php