creation de la template
Merge origin/master