Production icons

Changes how the production queue gets its icons, the icon name is no longer in the renderer and has been moved to the buildable trait. There is also a  new upgrade rule that converts all yaml files to this new format.
Merge conflict leftovers.