forgot the .lock file
Merge branch 'master' into prod
remove useless line in mobile scss
Merge branch 'master' into prod