feature(all): make Grunt file concat and minify CSS/JS on grunt watch
also fix SCSS file to have one main.scss to compile to
Merge pull request #162 from Yahkob/gruntDeployTasks

feature(all): make Grunt file concat and minify CSS/JS on grunt watch