merge with quentin (templates inclusion fix)
merge with quentin (templates inclusion fix)

izberg-marketplace/django-izberg,izberg-marketplace/django-izberg,Iceberg-Marketplace/django-iceberg,Iceberg-Marketplace/django-iceberg