updated template inheritance and hover for reroute
Merging conflicts
hover info for city contact
Merge
Adding a template for public view
Merging custom.css