complete AI framework
merge fix
Merge branch 'develop' into ai
Merge branch 'ai' into develop