Renommages.
Merge branch 'master' of github.com:pierrebinauld/Journey
Merge branch 'master' of github.com:pierrebinauld/Journey
Updated database structure.
Merge remote-tracking branch 'origin/master'