Changes in the template
fixed conflict
Merge branch 'cyrille'
merged conflict