fixed errors caused by the new conviction constructor. Please be careful when you change them.
Merge branch 'master' of https://github.com/rospiess/CrimeBook

Conflicts:
	src/ch/ethz/inf/dbproject/SearchServlet.java
	src/ch/ethz/inf/dbproject/model/DatastoreInterface.java
Merge branch 'master' of https://github.com/rospiess/CrimeBook

Conflicts:
	src/ch/ethz/inf/dbproject/SearchServlet.java
	src/ch/ethz/inf/dbproject/model/DatastoreInterface.java
Registration working