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

Revert revert due to Springie problems.