Use Sass nesting rather than verbose, vanilla nesting
Merge branch 'dev'