fix merge

delivery_fee/templates/C_delivery_fee.html

delivery_fee/templates/R_delivery_fee.html

delivery_fee/views.py

food/views.py

food_category/__init__.py

food_category/admin.py

food_category/apps.py

food_category/migrations/__init__.py

food_category/models.py

food_category/templates/c_food_category.html

food_category/templates/r_food_category.html

food_category/tests.py

food_category/urls.py

food_category/views.py

ingredient/templates/c_ingredient.html

ingredient/templates/r_ingredient.html

ingredient/views.py

...action_courier/templates/r_order_transaction_courier.html

order_transaction_courier/urls.py

order_transaction_courier/views.py