Merge branch 'develop'
adding some more details for blabla
updating descriptions
adding a 'better' icon set
Merge branch 'master' into gh-pages
canging name format
Merge branch 'gh-pages' into develop
changing french l10n