ToMerge
Merge branch 'master' of https://github.com/vdemotz/IntroDBProject

Conflicts:
	WebContent/Case.jsp
Merge branch 'master' of https://github.com/vdemotz/IntroDBProject