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

Conflicts:
	WebContent/PersonCreation.jsp
	src/ch/ethz/inf/dbproject/PersonCreationServlet.java
InconsistentAttribute