added restaurants and updated survey page
fix merge conflicts