aaaaa
Merge remote-tracking branch 'origin/viet_dev1_thin' into viet_dev1

Conflicts:
	app/code/local/Magestore/Featuredproduct/Block/Category/tttt.php