Merge branch 'connor-dev-scss' of git.unicaen.fr:open-source/oscar into connor-api