merging development into chico-dev

Adding AI code to chico-dev