.
Merge branch 'master' of
https://github.com/TingelTangelTom/SaatgutOnline.git

Conflicts:
	SaatgutOnline/WebContent/WEB-INF/web.xml
Merge branch 'master' of https://github.com/TingelTangelTom/SaatgutOnline.git
...