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