Mark fixed shop slugs for translation (docs: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#translating-url-patterns).
Merge branch 'feature/translatable-shop-url-prefixes' into feature/polish-translation-update
Merge branch 'feature/translatable-shop-url-prefixes' into develop
Merge branch 'feature/polish-translation-update' into develop
Translated shop urls.
Merge branch 'feature/polish-translation-update' into develop
Mark fixed shop slugs for translation (docs: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#translating-url-patterns).
Merge branch 'feature/translatable-shop-url-prefixes' into feature/polish-translation-update

Conflicts:
	cartridge/shop/urls.py
Merge branch 'feature/translatable-shop-url-prefixes' into develop

Conflicts:
	cartridge/shop/urls.py
Merge branch 'feature/polish-translation-update' into develop
Mark fixed shop slugs for translation (docs: https://docs.djangoproject.com/en/dev/topics/i18n/translation/#translating-url-patterns).
Merge branch 'feature/translatable-shop-url-prefixes' into feature/polish-translation-update

Conflicts:
	cartridge/shop/urls.py
Merge branch 'feature/translatable-shop-url-prefixes' into develop

Conflicts:
	cartridge/shop/urls.py
Merge branch 'feature/polish-translation-update' into develop
Fix displaying product form with empty ``SHOP_OPTION_TYPE_CHOICES``.
Merge branch 'feature/empty-options-fields' into develop
Store translated product descriptions and urls in cart (in case user changes language after adding a product).
Merge branch 'feature/modeltranslation-integration' into develop