Added work address fields to doctor detail
Added redirects in Servlets, Default route login.servlet,  Removed Settings from NavBar
resolved merge conflicts
resolved merge conflicts again