Upgrade costs now compounds per level
Merge remote-tracking branch 'origin/master'