Add what to do in case of conflicts between spring and the database.
Merge branch 'master' of https://github.com/palkeo/projet-jee