Add utilities folder to scss
Merge master