Update style
Update wording
Add grunt-helper
Merge branch 'dev'