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
Fixed Interrupt Armor/Threat Meter Logic
Disabled DrawLevel function nameplates as it wasn't being used. refer to comments at the top to see what was disabled
Merge branch 'master' of https://github.com/benjiro/VikingNameplates into development
Merge pull request #25 from benjiro/development

Fixed Interrupt Armor/Threat Indicator Logic
Resolving conflicts