Renamed sass dir to scss
Added support for Grunt
Merge branch 'develop'