added all products by type and all types
Merge remote-tracking branch 'origin/master'