Merge branch 'Milestone-3' into 52-change-request-modify-restaurant-x-category-relationship-to-many-to-many