Merge branch 'feature-inscription' into develop
Merge branch 'develop' of https://github.com/nyvon/CdP-Scrum into develop