Merge pull request #50 from chrqls/dev

[#42] Merging and redirect students to StartMaking step but...
[#42] Retake scenario well managed on server and web app now
Merge commit '9a0fa2c' into dev