Added NavBar.jsp and fixed conflicts files