Disabled rome civic that we dont have a model for
Made border of tooltip thinner
Extended popup to indicate resource revenue
Merge remote-tracking branch 'origin/popup'