Moved yanfs to the tree
Merge branch 'muc2tree'