removed sass cache
Merge branch 'develop'