Merge branch 'dev' into refacto-app

This commit is contained in:
Sebastien Chopin 2017-10-20 10:50:54 +02:00
commit d9e2e1763c