WIP, added AddDecorator in BTBuilder
Merge conflict resolution