Revert "Merge branch 'master' of https://github.com/rcsv/factorySimulator"

This reverts commit a972108108ec394e603b3930444b5f5a98e3447c, reversing
changes made to 0f249f1d63a575c9e70f7faafcfa5d25b38bd106.
Revert "Revert "Merge branch 'master' of https://github.com/rcsv/factorySimulator""

This reverts commit 710f59739c3fe132ea8d0e0d284c9d02aa404148.
Merge Description