nichts nennenswertes
test
neuer commit
Merge commit '48ac5333048630da351c2b0ac23140133783f372'

Conflicts:
	NodeAnimator/bin/server/NodeServer.class
	NodeAnimator/src/server/NodeServer.java