part AI director
Merge remote-tracking branch 'origin/master'

Conflicts:
	JdS/Library/CurrentLayout.dwlt
	JdS/Library/assetDatabase3
	JdS/Library/guidmapper