Merge pull request #4676 from cjshmyr/capturing-cursors

Swap cursors used for sabotaging and capturing buildings
Added RenderNameTag trait