update information
en
change templates
Merge branch 'gh-pages'