Fixes of issues 60 & 118
Merge branch 'develop' of git@github.com:EsupPortail/esup-opi.git into develop