Some Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/web.xml
Merge branch 'master' of github.com:/harrer/GobiGruppe1