Disable statisticsDatastore, go to "porting" branc
Merge branch 'master' of https://github.com/vdemotz/IntroDBProject
Changed ConvictionDatastore, personDatastore
Merge branch 'master' into porting

Conflicts:
	WebContent/Home.jsp
	src/ch/ethz/inf/dbproject/HomeServlet.java
	src/ch/ethz/inf/dbproject/StatisticsServlet.java
	src/ch/ethz/inf/dbproject/database/ConvictionDatastore.java
	src/ch/ethz/inf/dbproject/database/DatastoreInterface.java