Merge branch Clownfish into dev
removed Bookings and Filtering from navbar