updated gruntfile
updated title for testing
Merge remote-tracking branch 'origin/dev'