Merge pull request #6 from hongoctrien/develop

Fix: thumb type product
module Shops: fix group, category
Merge pull request #2 from nukeviet/develop

Update code from nukeviet (08/03/2014)