Added in CivTrade data to the Trade tab. Removed block icons until I can get a full JSON file of blocks.
Merge branch 'master' into gh-pages