Servlet stuff
Merge branch 'master' of https://github.com/ralphsb/InnoChallenge

Conflicts:
	WebContent/src/templates/pad.html