daolm - product module
resolve confict
Merge pull request #6 from daolm/master

product - module