Fixed mulit-dimensional aggro bug
Fixed XP
Merge branch 'master' into gh-pages
Updating