Added CCArmor and seperated it from HealthShieldBar
Merge branch 'master' of https://github.com/sgorman/wspvpaddon