merged in photo model from master
removed carts scaffold