Merge remote-tracking branch 'origin/master'
# Conflicts: # rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/Evaluator.java # ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptArea.java
# Conflicts: # rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/Evaluator.java # ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ScriptArea.java