Merge pull request #162 from Yahkob/gruntDeployTasks

feature(all): make Grunt file concat and minify CSS/JS on grunt watch
feature(gruntfile.js): fix app to actually use concatted/uglified JS