Remove the '<<<<<<< HEAD'
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core