änderungen
Merge branch 'master' of
https://github.com/raphaelschmitz/agb_analyse.git

Conflicts:
	src/com/bjr/server/BackendServlet.java