initial conviction functionality (might still be buggy)
initial conviction functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	IntroDBProject/src/ch/ethz/inf/dbproject/CasesServlet.java