Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/Enigma/model/Hardware.java

src/main/java/Enigma/model/Walze.java

 package Enigma.model;
 
+import java.time.Year;
+
 /**
  * Klasse Walze
  * <p>