Merge branch 'master' into 'master'

# Conflicts:
#   src/main/java/Enigma/model/Hardware.java
#   src/main/java/Enigma/model/Walze.java
#   src/test/java/Enigma/model/ReflektorTest.java
#   src/test/java/Enigma/model/SteckbrettTest.java
#   src/test/java/Enigma/model/WalzeTest.java