x
Merge branch 'master' of https://www.github.com/jhinkel/SystemDynamics

Conflicts:
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$EventRedirector.class