Merge pull request #7 from williecheong/staging

Staging
changed tags for use with group products
Merge branch 'master' into staging
Merge branch 'staging' into Groups-by-product