Update Fork

Update fork to current state of Civcraft master branch of Citadel.