Merge pull request #3 from nukeviet/develop

 Able to merge
Update content.php

Fix error Duplicate block id when update product
Merge pull request #11 from thangbv/develop

Merge pull request #3 from nukeviet/develop
Using javascript jquery ajax instead nv_ajax
Module Shops: change link view detail
Merge remote-tracking branch 'hongoctrien/develop' into develop

Conflicts:
	modules/shops/blocks/global.block_product_center.php
	modules/shops/blocks/global.block_relates_product.php
	modules/shops/blocks/module.block_others_product.php
	modules/shops/blocks/module.block_product_center.php
	modules/shops/funcs/main.php
Merge pull request #3 from nukeviet/develop

Update code from nukeviet shops (03/04/2014)