new icon for tree
fix merge conflict
Merge branch 'master' into gh-pages
rename to make cdn work