Merge pull request #13 from HallCat/mergeyGui

Large GUI update
Merge pull request #12 from HallCat/extraGUI

Worker generation and gui aspects
Delete WithoutThem.pro.user
Merge pull request #14 from HallCat/mergeyGui

Mergey gui
Added factory upgrades
Merge pull request #15 from HallCat/factoryUpgrade

Added factory upgrades
fixing conflicts