Merge branch 'master' of
https://github.com/pouzzler/IED-Logic-Simulator.git

Conflicts:
	src/gui/mainwindow.py
Revert "Merge branch 'master' of https://github.com/pouzzler/IED-Logic-Simulator.git"

This reverts commit 538f273828535bc03f116395ad2f375e9dd9716e.
Merge branch 'master' of https://github.com/pouzzler/IED-Logic-Simulator.git
(re)load log output config