make sure breakpoints are in sync between css and js
Merge branch 'master' into develop