translation possible! + french translation available
Merge branch 'master' into gh-pages