Merge dev branch into master.

this will pull the new enemy AI into master.