-testcommit
Merge branch 'master' of https://github.com/ATLASsoft/SoPra

Conflicts:
	NodeAnimator/src/de/atlassoft/ui/AboutDialog.java
	NodeAnimator/src/de/atlassoft/ui/TrainTypeDialog.java
Merge branch 'master' of https://github.com/ATLASsoft/SoPra.git

Conflicts:
	NodeAnimator/bin/de/atlassoft/ui/TrainTypeDialog$2.class
	NodeAnimator/bin/de/atlassoft/ui/TrainTypeDialog$3.class
	NodeAnimator/bin/de/atlassoft/ui/TrainTypeDialog$4.class
	NodeAnimator/bin/de/atlassoft/ui/TrainTypeDialog.class
	NodeAnimator/src/de/atlassoft/ui/TrainTypeDialog.java