Merge branch 'origin/AI'

Conflicts:
	AI.js