Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

src/ui/view/TimePanel.java

@@ -219,10 +219,10 @@ public class TimePanel extends JPanel {
 		speedSlider.setPaintTicks(true);
 		speedSlider.setPaintLabels(true);
 		speedSlider.setToolTipText("Speed: 1000");
-		speedSlider.setMaximum(10000);
-		speedSlider.setMinimum(0);
+		speedSlider.setMaximum(5000);
+		speedSlider.setMinimum(500);
 		speedSlider.setValue(1000);
-		speedSlider.setMajorTickSpacing(2000);
+		//speedSlider.setMajorTickSpacing(100);
 		speedSlider.addChangeListener(new ChangeListener() {
 			@Override
 			public void stateChanged(ChangeEvent e) {