Merge pull request #779 from Windower/4.1-dev

Dev > Live merge
Merge pull request #781 from Windower/4.1-dev

Pointwatch error quick fix
Merge pull request #782 from Windower/4.1-dev

GearSwap - Skill type error
Merge pull request #783 from Windower/4.1-dev

GearSwap - Oops
Merge pull request #784 from Windower/4.1-dev

Pointwatch - more assertion protection
Merge pull request #785 from Windower/4.1-dev

GearSwap and Rolltracker fixes
Merge pull request #786 from Windower/4.1-dev

Temporary resources fix
Merge pull request #788 from Windower/4.1-dev

Bullshit fix
Plasmon fixes again
Merge pull request #789 from Windower/4.1

4.1