Added new stuff
Merge branch 'master' of https://github.com/jhinkel/SystemDynamics

Conflicts:
	SD-S10/bin/de/uka/aifb/com/systemDynamics/DrawGraphs_Init.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$1.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$2.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$3.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$4.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ChangeModelNameAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$CloseAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$EventRedirector.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ExecuteModelAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewAuxiliaryNodeAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewConstantNodeAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewLevelNodeAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewRateNodeAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$NewSourceSinkNodeAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$OpenAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$SaveAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$SaveAsAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ToggleAddFlowAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ZoomInAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ZoomOutAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame$ZoomStandardAction.class
	SD-S10/bin/de/uka/aifb/com/systemDynamics/gui/MainFrame.class
	SD-S10/src/de/uka/aifb/com/systemDynamics/gui/MainFrame.java
	SD-S10/systemdynamicsGUI.jar
x
Merge branch 'master' of https://www.github.com/jhinkel/SystemDynamics

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