ga
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/app/config/admin.php
	www/app/lang/vn/common.php