Merge branch 'master' into web
Merge branch 'develop' into web
Merge branch 'develop' into web
Add web application.
Add 'valoration' field to mixture model.
Add empty mixture URL conf.
Add basics URL configurations.
Merge branch 'web' into develop