Fixed grunt file, reformat code
Merge remote-tracking branch 'origin/master'