Merge pull request #7 from SixtusTheFifth/master

Conflicts/Mismatches fixed for CyberCore, WarpPrism, Hercules. Factory conflicts changed
Fixed up HotS conflict checks.
Left2Die keys, conflict and same checks
Starport tech lab same checks
Factory techlab checks
other layouts generated
Darglins Micro Trainer
other layouts generated