Added attack cursor
Merge origin/master