Ignore SASS cache
Merge branch 'master' into dev