[ADD] Module which adds Category ID to products (rather than templates).
[MERGE] Merge remote-tracking branch 'origin/product-product-category'
Merge branch 'addons-7.0'