Attributes now completely in Hero_Attributes
Merge remote-tracking branch 'origin/master'