start to integrate cluster and tree
Merge remote-tracking branch 'origin/master'