Merge pull request #4 from nukeviet/develop

merge from NukeViet
module shops: update menu for admin
module shops: update data setup
module shops: add theme modern
Merge pull request #5 from nukeviet/develop

Able to merge
Theme.php: Fix tag script close
Merge pull request #25 from thangbv/develop

Thêm thẻ đóng Script
mover javascript file to the template file
module shops: fix comment theme modern
Merge pull request #6 from nukeviet/develop

Update code from nukeviet (17/05/2014)