Merge pull request #1 from jigoshop/dev

Dev
fixed problem with not unique IDs
Merge pull request #859 from piotr-szczygiel/dev

fixed problem with not unique IDs