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 merge conflicts
Resolving conflicts
hotfix: Nameplates crash #26
Merge pull request #30 from vikinghug/master

whitespace
Merge pull request #31 from vikinghug/development

Development