merge
Merge branch 'master'
Merge branch 'master'
merge
cleaning config
Merge branch 'master'
.
Merge branch 'master'
BaseObject toString()
Merge pull request #26 from 5-second-rule/origin/ai-manager

Origin/ai manager