- resolved merge problems
- added TradeScenario
  -> TradeScenarioPanel.java not correct invoked. Therefor the ActionListener is null.
     Please have a look.
- removed unused imports
- added Harbors to Constants
- resolved some merge problems