Add reporting tab and fix merge conflict

README

app/__init__.py

app/admin/routes.py

app/bookings/routes.py

app/errors/routes.py

app/main/routes.py

app/models/listing_images.py

app/models/role.py

app/static/base.css

app/static/listings.css

app/templates/admin/edit_user.html

app/templates/base.html

app/templates/bookings/listing.html

app/templates/errors/quandary.html

app/templates/index.html

app/templates/main/about_us.html

app/templates/main/contact_us.html

app/templates/main/faq.html

app/templates/main/privacy_policy.html

app/templates/main/tos.html