data.sql enrichi
resolution de conflit
add request to get obsolete reservations from database
Merge branch 'master' of github.com:tdubourg/velov-unchained