Merge

Fixes icons, hydroponics, security paramedics, reinforced walls and the
map.