Adding gruntfile
Merge remote-tracking branch 'af/master'