rdgf
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal

Conflicts:
	WebContent/META-INF/context.xml
fuuuuuuuuuuuu
andis scheiß
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal
Merge branch 'master' of https://github.com/floatec/WAI-webcam-portal