Merge pull request #8 from SSD-ESIEA/dev

Dev
Merge pull request #10 from SSD-ESIEA/dev

Dev
Merge branch 'dev'
Merge pull request #19 from SSD-ESIEA/dev

Dev
Merge pull request #21 from SSD-ESIEA/dev

Dev
Merge pull request #23 from SSD-ESIEA/dev

Dev
add about and idea
add things to main template
Merge branch 'master' of https://github.com/SSD-ESIEA/SSD into elements_en_plus
Merge branch 'dev' of https://github.com/SSD-ESIEA/SSD into elements_en_plus
Merge pull request #26 from SSD-ESIEA/elements_en_plus

Elements en plus