update brand
Merge remote-tracking branch 'origin/ThinhLD'

Conflicts:
	.idea/workspace.xml
	application/modules/admin/controllers/brand.php