Feature #351 : fixing a SQL mistake about constraints of table of subscriptions
Fixing dependency of French Locale for some formatting tests
Merge branch 'feature-351' of https://github.com/SilverYoCha/Silverpeas-Core into integration
Managing encoding in uploads
Remove the '<<<<<<< HEAD'
Merge branch 'master' of github.com:Silverpeas/Silverpeas-Core
Fixing error on Windows

The file is not updatable via copy, maybe a Windows FS problem.
Deleting it before copying fixes the problem
Merge remote-tracking branch 'origin/master' into jboss7
jboss7: configuring MDB using annotations instead of old xml descriptors