Resolved conflicts and fixed attack component bug.
Merge branch 'eradicate78-master'