working on a TourTransitInfo
working on a TourTransitInfo
Merge branch 'final_demo' of https://github.com/IF048JAVA/SoftTour into final_demo

Conflicts:
	src/main/webapp/WEB-INF/pages/layout/layout.jsp
	src/main/webapp/WEB-INF/pages/userProfile.jsp
resolved problem with collapses in favorite and history
Merge remote-tracking branch 'origin/final_demo' into final_demo