Merge branch 'master' into 'master'

GuiController aufgeräumt => Namen geändert, auch in der gui.fxml (Namen: fxid)

See merge request !127

src/main/resources/projekt/enigma/gui.fxml

@@ -5,16 +5,14 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.MenuButton?>
 <?import javafx.scene.control.TextField?>
-<?import javafx.scene.control.ToggleButton?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/8.0.999-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="962.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController">
    <children>
       <GridPane layoutX="23.0" layoutY="60.0" prefHeight="158.0" prefWidth="237.0" AnchorPane.leftAnchor="23.0" AnchorPane.topAnchor="60.0">
         <columnConstraints>
@@ -620,12 +618,6 @@
                   <Insets left="42.0" />
                </GridPane.margin>
             </Label>
-            <Pane prefHeight="200.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="7">
-               <children>
-                  <Pane fx:id="portPane" layoutX="-3.0" layoutY="-303.0" prefHeight="346.0" prefWidth="86.0" style="-fx-background-color: grey;" />
-               </children>
-            </Pane>
-            <ToggleButton mnemonicParsing="false" text="ToggleButton" GridPane.rowIndex="6" />
          </children>
       </GridPane>
       <GridPane layoutX="297.0" layoutY="64.0" prefHeight="168.0" prefWidth="585.0">