Merge pull request #2 from vikinghug/master

Upstream update
fixed VikingNameplates not showing textstring in options menu
Merge pull request #3 from Crowdedlight/bugfix

fixed VikingNameplates not showing textstring in options menu
Merge pull request #23 from Crowdedlight/master

fixed VikingNameplates not showing textstring in options menu
Merge pull request #24 from vikinghug/master

Match development with master