Merge branch 'master' into test
regenerated sprite png, removed sass-cache
Merge branch 'master' into test
Merge branch 'test' into prod