Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
version 2.5

new icons, simplified scructure, more examples
Merge branch 'ver2.5'