Merge pull request #1 from HackerPartie/jens_little_box

my own branch
Merge pull request #2 from HackerPartie/jens_little_box

the servlet is now defined in pom
Specify we work with java 1.7
database package hinzugefügt
the servlet is important