custom ordering for products; new flag ProductCategory.free_shipping
fixed merge conflict