Some SQL Testing
Merge branch 'master' of https://github.com/koradir/dmdb2014

Conflicts:
	WebContent/Home.jsp
	src/ch/ethz/inf/dbproject/HomeServlet.java