Tried to catch wrong input in the benachrichtingungen
Fuck pc died just wehn i pushed
Merge branch 'master' of git@github.com:ese-unibe-ch/ese2014-team2.git

Conflicts:
	Skeleton/src/main/java/org/eseTeam2/controller/AdController.java