Merge pull request #51 from chrqls/dev

[#42] Retake scenario well managed on server and web app now