Revert "Merge Dev into master because of our stupid build system."
Merge pull request #460 from ZeroK-RTS/revert-459-develop

Revert "Merge Dev into master because of our stupid build system."