Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Hercules, Warp Prism and CyberCore fix
Factory has separate WoL check and HotS check
Merge pull request #7 from SixtusTheFifth/master

Conflicts/Mismatches fixed for CyberCore, WarpPrism, Hercules. Factory conflicts changed