Merge branch 'feature/modeltranslation-integration' into develop
Merge branch 'feature/configurable-products' into develop

Conflicts:
	cartridge/shop/models.py
Merge branch 'feature/polish-translation-update' into develop